diff --git a/admin-pc/.env.development b/admin-pc/.env.development
index 9d58881..0aa32f0 100644
--- a/admin-pc/.env.development
+++ b/admin-pc/.env.development
@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8001/jewelry-admin/
+VUE_APP_API_BASE_URL=https://jewelry-admin.hhlm1688.com/jewelry-admin/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 
diff --git a/admin-pc/.env.production b/admin-pc/.env.production
index 2bdc95e..9a476f5 100644
--- a/admin-pc/.env.production
+++ b/admin-pc/.env.production
@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=http://localhost:8001/jewelry-admin/
+VUE_APP_API_BASE_URL=https://jewelry-admin.hhlm1688.com/jewelry-admin/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file
diff --git a/admin-pc/src/views/orderList/CommonOrderList.vue b/admin-pc/src/views/orderList/CommonOrderList.vue
new file mode 100644
index 0000000..3f725d3
--- /dev/null
+++ b/admin-pc/src/views/orderList/CommonOrderList.vue
@@ -0,0 +1,309 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="订单状态">
+              <j-dict-select-tag placeholder="请选择订单状态" v-model="queryParam.state" dictCode="order_state"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="标题">
+              <a-input placeholder="请输入标题" v-model="queryParam.title"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="姓名">
+                <a-input placeholder="请输入姓名" v-model="queryParam.name"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="电话">
+                <a-input placeholder="请输入电话" v-model="queryParam.phone"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="用户">
+                <j-search-select-tag placeholder="请选择用户" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="商品标识">
+                <j-search-select-tag placeholder="请选择商品标识" v-model="queryParam.shopId" dict="common_shop,title,id"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="商品类型">
+                <j-dict-select-tag placeholder="请选择商品类型" v-model="queryParam.shopState" dictCode="shop_type"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+      <a-button type="primary" icon="download" @click="handleExportXls('订单信息表')">导出</a-button>
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)" v-if="record.state =='1' ">发货</a>
+
+<!--          <a-divider type="vertical" />-->
+<!--          <a-dropdown>-->
+<!--            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->
+<!--            <a-menu slot="overlay">-->
+<!--              <a-menu-item>-->
+<!--                <a @click="handleDetail(record)">详情</a>-->
+<!--              </a-menu-item>-->
+<!--              <a-menu-item>-->
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--                  <a>删除</a>-->
+<!--                </a-popconfirm>-->
+<!--              </a-menu-item>-->
+<!--            </a-menu>-->
+<!--          </a-dropdown>-->
+        </span>
+
+      </a-table>
+    </div>
+
+    <common-order-modal ref="modalForm" @ok="modalFormOk"></common-order-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CommonOrderModal from './modules/CommonOrderModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CommonOrderList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CommonOrderModal
+    },
+    data () {
+      return {
+        description: '订单信息表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'订单状态',
+            align:"center",
+            dataIndex: 'state_dictText'
+          },
+          {
+            title:'标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'价格',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'数量',
+            align:"center",
+            dataIndex: 'num'
+          },
+          {
+            title:'规格',
+            align:"center",
+            dataIndex: 'sku'
+          },
+          {
+            title:'姓名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'地址',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'详细地址',
+            align:"center",
+            dataIndex: 'addressDetails'
+          },
+          {
+            title:'用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title:'商品标识',
+            align:"center",
+            dataIndex: 'shopId_dictText'
+          },
+          // {
+          //   title:'商品类型',
+          //   align:"center",
+          //   dataIndex: 'shopState_dictText'
+          // },
+          // {
+          //   title:'推荐购买会员',
+          //   align:"center",
+          //   dataIndex: 'shareId'
+          // },
+          // {
+          //   title:'第几次推荐购买',
+          //   align:"center",
+          //   dataIndex: 'shareNum'
+          // },
+          {
+            title:'快递公司',
+            align:"center",
+            dataIndex: 'kuai'
+          },
+          {
+            title:'物流订单',
+            align:"center",
+            dataIndex: 'wuliu'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/commonOrder/commonOrder/list",
+          delete: "/commonOrder/commonOrder/delete",
+          deleteBatch: "/commonOrder/commonOrder/deleteBatch",
+          exportXlsUrl: "/commonOrder/commonOrder/exportXls",
+          importExcelUrl: "commonOrder/commonOrder/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'int',value:'state',text:'订单状态',dictCode:'order_state'})
+        fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
+        fieldList.push({type:'int',value:'num',text:'数量',dictCode:''})
+        fieldList.push({type:'string',value:'sku',text:'规格',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'addressDetails',text:'详细地址',dictCode:''})
+        fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'shopId',text:'商品标识',dictTable:"common_shop", dictText:'title', dictCode:'id'})
+        fieldList.push({type:'int',value:'shopState',text:'商品类型',dictCode:'shop_type'})
+        fieldList.push({type:'string',value:'shareId',text:'推荐购买会员',dictCode:''})
+        fieldList.push({type:'int',value:'shareNum',text:'第几次推荐购买',dictCode:''})
+        fieldList.push({type:'string',value:'kuai',text:'快递公司',dictCode:''})
+        fieldList.push({type:'string',value:'wuliu',text:'物流订单',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/admin-pc/src/views/orderList/modules/CommonOrderForm.vue b/admin-pc/src/views/orderList/modules/CommonOrderForm.vue
new file mode 100644
index 0000000..63a14a7
--- /dev/null
+++ b/admin-pc/src/views/orderList/modules/CommonOrderForm.vue
@@ -0,0 +1,179 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="订单状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <j-dict-select-tag type="list" v-model="model.state" dictCode="order_state" placeholder="请选择订单状态" disabled />
+            </a-form-model-item>
+          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">-->
+<!--              <a-input v-model="model.title" placeholder="请输入标题"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">-->
+<!--              <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">-->
+<!--              <a-input-number v-model="model.num" placeholder="请输入数量" style="width: 100%" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sku">-->
+<!--              <a-input v-model="model.sku" placeholder="请输入规格"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+          <a-col :span="24">
+            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入姓名" disabled ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入电话" disabled ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入地址"  disabled></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="详细地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressDetails">
+              <a-input v-model="model.addressDetails" placeholder="请输入详细地址"  disabled></a-input>
+            </a-form-model-item>
+          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">-->
+<!--              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="商品标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">-->
+<!--              <j-search-select-tag v-model="model.shopId" dict="common_shop,title,id"  />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="商品类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopState">-->
+<!--              <j-dict-select-tag type="list" v-model="model.shopState" dictCode="shop_type" placeholder="请选择商品类型" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="推荐购买会员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shareId">-->
+<!--              <a-input v-model="model.shareId" placeholder="请输入推荐购买会员"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="第几次推荐购买" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shareNum">-->
+<!--              <a-input-number v-model="model.shareNum" placeholder="请输入第几次推荐购买" style="width: 100%" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+          <a-col :span="24">
+            <a-form-model-item label="快递公司" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kuai">
+              <a-input v-model="model.kuai" placeholder="请输入快递公司"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="物流订单" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wuliu">
+              <a-input v-model="model.wuliu" placeholder="请输入物流订单"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CommonOrderForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/commonOrder/commonOrder/add",
+          edit: "/commonOrder/commonOrder/edit",
+          queryById: "/commonOrder/commonOrder/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/admin-pc/src/views/orderList/modules/CommonOrderModal.Style#Drawer.vue b/admin-pc/src/views/orderList/modules/CommonOrderModal.Style#Drawer.vue
new file mode 100644
index 0000000..fdc5994
--- /dev/null
+++ b/admin-pc/src/views/orderList/modules/CommonOrderModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <common-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></common-order-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CommonOrderForm from './CommonOrderForm'
+
+  export default {
+    name: 'CommonOrderModal',
+    components: {
+      CommonOrderForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/admin-pc/src/views/orderList/modules/CommonOrderModal.vue b/admin-pc/src/views/orderList/modules/CommonOrderModal.vue
new file mode 100644
index 0000000..7e27362
--- /dev/null
+++ b/admin-pc/src/views/orderList/modules/CommonOrderModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <common-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></common-order-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CommonOrderForm from './CommonOrderForm'
+  export default {
+    name: 'CommonOrderModal',
+    components: {
+      CommonOrderForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/admin-pc/src/views/waterList/CommonMoneyLogList.vue b/admin-pc/src/views/waterList/CommonMoneyLogList.vue
new file mode 100644
index 0000000..090ec10
--- /dev/null
+++ b/admin-pc/src/views/waterList/CommonMoneyLogList.vue
@@ -0,0 +1,252 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--            <a-form-item label="流水标题">-->
+<!--              <a-input placeholder="请输入流水标题" v-model="queryParam.title"></a-input>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--            <a-form-item label="类型">-->
+<!--              <j-dict-select-tag placeholder="请选择类型" v-model="queryParam.type" dictCode="pay_type"/>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+<!--          <template v-if="toggleSearchStatus">-->
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="状态">
+                <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.state" dictCode="pay_state"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="用户标识">
+                <j-search-select-tag placeholder="请选择用户标识" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/>
+              </a-form-item>
+            </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="提现状态">
+              <j-dict-select-tag placeholder="请选择提现状态" v-model="queryParam.txState" dictCode="tx_state_sub"/>
+            </a-form-item>
+          </a-col>
+<!--          </template>-->
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+      <a-button type="primary" icon="download" @click="handleExportXls('流水日志表')">导出</a-button>
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleDelete(record.id)">审核通过</a>
+          <a-divider type="vertical" />
+          <a @click="handleDelete(record.id)">驳回申请</a>
+<!--          <a-dropdown>-->
+<!--            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->
+<!--            <a-menu slot="overlay">-->
+<!--              <a-menu-item>-->
+<!--                <a @click="handleDetail(record)">详情</a>-->
+<!--              </a-menu-item>-->
+<!--              <a-menu-item>-->
+<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--                  <a>删除</a>-->
+<!--                </a-popconfirm>-->
+<!--              </a-menu-item>-->
+<!--            </a-menu>-->
+<!--          </a-dropdown>-->
+        </span>
+
+      </a-table>
+    </div>
+
+    <common-money-log-modal ref="modalForm" @ok="modalFormOk"></common-money-log-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CommonMoneyLogModal from './modules/CommonMoneyLogModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CommonMoneyLogList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CommonMoneyLogModal
+    },
+    data () {
+      return {
+        description: '流水日志表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'创建日期',
+            align:"center",
+            sorter: true,
+            dataIndex: 'createTime'
+          },
+          {
+            title:'流水标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'提现金额',
+            align:"center",
+            dataIndex: 'money'
+          },
+          {
+            title:'姓名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'开户行',
+            align:"center",
+            dataIndex: 'bankName'
+          },
+          {
+            title:'银行卡号',
+            align:"center",
+            dataIndex: 'bankNo'
+          },
+          // {
+          //   title:'提现状态',
+          //   align:"center",
+          //   dataIndex: 'txStateSub'
+          // },
+          {
+            title:'用户标识',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/commonMoneyLog/commonMoneyLog/list",
+          delete: "/commonMoneyLog/commonMoneyLog/delete",
+          deleteBatch: "/commonMoneyLog/commonMoneyLog/deleteBatch",
+          exportXlsUrl: "/commonMoneyLog/commonMoneyLog/exportXls",
+          importExcelUrl: "commonMoneyLog/commonMoneyLog/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'string',value:'title',text:'流水标题',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'money',text:'变动金额',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'oldMoney',text:'原钱包金额',dictCode:''})
+        fieldList.push({type:'int',value:'type',text:'类型',dictCode:'pay_type'})
+        fieldList.push({type:'int',value:'state',text:'状态',dictCode:'pay_state'})
+        fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'string',value:'isGet',text:'是否提现',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/admin-pc/src/views/waterList/modules/CommonMoneyLogForm.vue b/admin-pc/src/views/waterList/modules/CommonMoneyLogForm.vue
new file mode 100644
index 0000000..0ff5f51
--- /dev/null
+++ b/admin-pc/src/views/waterList/modules/CommonMoneyLogForm.vue
@@ -0,0 +1,139 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="流水标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">-->
+<!--              <a-input v-model="model.title" placeholder="请输入流水标题"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+          <a-col :span="24">
+            <a-form-model-item label="提现金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money">
+              <a-input-number v-model="model.money" placeholder="请输入提现金额" style="width: 100%" disabled />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldMoney">
+              <a-input-number v-model="model.name" placeholder="请输入姓名" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldMoney">
+              <a-input-number v-model="model.bankName" placeholder="请输入开户行" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="银行卡号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldMoney">
+              <a-input-number v-model="model.bankNo" placeholder="请输入银行卡号" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">-->
+<!--              <j-dict-select-tag type="list" v-model="model.type" dictCode="pay_type" placeholder="请选择类型" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">-->
+<!--              <j-dict-select-tag type="list" v-model="model.state" dictCode="pay_state" placeholder="请选择状态" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+          <a-col :span="24">
+            <a-form-model-item label="用户标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CommonMoneyLogForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/commonMoneyLog/commonMoneyLog/add",
+          edit: "/commonMoneyLog/commonMoneyLog/edit",
+          queryById: "/commonMoneyLog/commonMoneyLog/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/admin-pc/src/views/waterList/modules/CommonMoneyLogModal.Style#Drawer.vue b/admin-pc/src/views/waterList/modules/CommonMoneyLogModal.Style#Drawer.vue
new file mode 100644
index 0000000..b01a85e
--- /dev/null
+++ b/admin-pc/src/views/waterList/modules/CommonMoneyLogModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <common-money-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></common-money-log-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CommonMoneyLogForm from './CommonMoneyLogForm'
+
+  export default {
+    name: 'CommonMoneyLogModal',
+    components: {
+      CommonMoneyLogForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/admin-pc/src/views/waterList/modules/CommonMoneyLogModal.vue b/admin-pc/src/views/waterList/modules/CommonMoneyLogModal.vue
new file mode 100644
index 0000000..6041bfb
--- /dev/null
+++ b/admin-pc/src/views/waterList/modules/CommonMoneyLogModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <common-money-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></common-money-log-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CommonMoneyLogForm from './CommonMoneyLogForm'
+  export default {
+    name: 'CommonMoneyLogModal',
+    components: {
+      CommonMoneyLogForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java
index e127f61..9b4def9 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java
@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2025-01-02
+ * @Date:   2025-01-20
  * @Version: V1.0
  */
 @Api(tags="订单信息表")
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java
index 9451a9d..fdc6b1f 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java
@@ -24,7 +24,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2025-01-02
+ * @Date:   2025-01-20
  * @Version: V1.0
  */
 @Data
@@ -60,7 +60,8 @@ public class CommonOrder implements Serializable {
     @ApiModelProperty(value = "图片")
     private java.lang.String image;
 	/**支付状态*/
-	@Excel(name = "支付状态", width = 15)
+	@Excel(name = "支付状态", width = 15, dicCode = "order_state")
+	@Dict(dicCode = "order_state")
     @ApiModelProperty(value = "支付状态")
     private java.lang.Integer state;
 	/**价格*/
@@ -92,7 +93,8 @@ public class CommonOrder implements Serializable {
     @ApiModelProperty(value = "详细地址")
     private java.lang.String addressDetails;
 	/**用户*/
-	@Excel(name = "用户", width = 15)
+	@Excel(name = "用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "用户")
     private java.lang.String userId;
 	/**地址标识*/
@@ -100,7 +102,8 @@ public class CommonOrder implements Serializable {
     @ApiModelProperty(value = "地址标识")
     private java.lang.String addressId;
 	/**商品标识*/
-	@Excel(name = "商品标识", width = 15)
+	@Excel(name = "商品标识", width = 15, dictTable = "common_shop", dicText = "title", dicCode = "id")
+	@Dict(dictTable = "common_shop", dicText = "title", dicCode = "id")
     @ApiModelProperty(value = "商品标识")
     private java.lang.String shopId;
 	/**支付编号*/
@@ -141,7 +144,8 @@ public class CommonOrder implements Serializable {
     @ApiModelProperty(value = "支付方式")
     private java.lang.Integer payType;
 	/**优惠券标识*/
-	@Excel(name = "优惠券标识", width = 15)
+	@Excel(name = "优惠券标识", width = 15, dictTable = "common_coupon", dicText = "money", dicCode = "id")
+	@Dict(dictTable = "common_coupon", dicText = "money", dicCode = "id")
     @ApiModelProperty(value = "优惠券标识")
     private java.lang.String couponId;
 	/**优惠价格*/
@@ -151,4 +155,5 @@ public class CommonOrder implements Serializable {
 
     @TableField(exist = false)
     private List<CommonOrderSku> commonOrderSkuList;
+
 }
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java
index 3c7d40b..081090d 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2025-01-02
+ * @Date:   2025-01-20
  * @Version: V1.0
  */
 public interface CommonOrderMapper extends BaseMapper<CommonOrder> {
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java
index 647f6fd..d553567 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2025-01-02
+ * @Date:   2025-01-20
  * @Version: V1.0
  */
 public interface ICommonOrderService extends IService<CommonOrder> {
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java
index b185487..21f1089 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2025-01-02
+ * @Date:   2025-01-20
  * @Version: V1.0
  */
 @Service
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue
index 8d3a02b..d973b3b 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue
@@ -5,8 +5,8 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="商品类型">
-              <j-dict-select-tag placeholder="请选择商品类型" v-model="queryParam.shopState" dictCode="shop_type"/>
+            <a-form-item label="支付状态">
+              <j-dict-select-tag placeholder="请选择支付状态" v-model="queryParam.state" dictCode="order_state"/>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -137,6 +137,12 @@
               return parseInt(index)+1;
             }
           },
+          {
+            title:'创建日期',
+            align:"center",
+            sorter: true,
+            dataIndex: 'createTime'
+          },
           {
             title:'标题',
             align:"center",
@@ -145,7 +151,7 @@
           {
             title:'支付状态',
             align:"center",
-            dataIndex: 'state'
+            dataIndex: 'state_dictText'
           },
           {
             title:'价格',
@@ -185,27 +191,12 @@
           {
             title:'用户',
             align:"center",
-            dataIndex: 'userId'
+            dataIndex: 'userId_dictText'
           },
           {
             title:'商品标识',
             align:"center",
-            dataIndex: 'shopId'
-          },
-          {
-            title:'商品类型',
-            align:"center",
-            dataIndex: 'shopState_dictText'
-          },
-          {
-            title:'推荐购买会员',
-            align:"center",
-            dataIndex: 'shareId'
-          },
-          {
-            title:'第几次推荐购买',
-            align:"center",
-            dataIndex: 'shareNum'
+            dataIndex: 'shopId_dictText'
           },
           {
             title:'快递公司',
@@ -222,11 +213,6 @@
             align:"center",
             dataIndex: 'subText'
           },
-          {
-            title:'下单须知',
-            align:"center",
-            dataIndex: 'orderDetails'
-          },
           {
             title:'支付方式',
             align:"center",
@@ -235,7 +221,7 @@
           {
             title:'优惠券标识',
             align:"center",
-            dataIndex: 'couponId'
+            dataIndex: 'couponId_dictText'
           },
           {
             title:'优惠价格',
@@ -276,8 +262,9 @@
       },
       getSuperFieldList(){
         let fieldList=[];
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
         fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
-        fieldList.push({type:'int',value:'state',text:'支付状态',dictCode:''})
+        fieldList.push({type:'int',value:'state',text:'支付状态',dictCode:'order_state'})
         fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
         fieldList.push({type:'int',value:'num',text:'数量',dictCode:''})
         fieldList.push({type:'string',value:'sku',text:'规格',dictCode:''})
@@ -285,17 +272,13 @@
         fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
         fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
         fieldList.push({type:'string',value:'addressDetails',text:'详细地址',dictCode:''})
-        fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''})
-        fieldList.push({type:'string',value:'shopId',text:'商品标识',dictCode:''})
-        fieldList.push({type:'int',value:'shopState',text:'商品类型',dictCode:'shop_type'})
-        fieldList.push({type:'string',value:'shareId',text:'推荐购买会员',dictCode:''})
-        fieldList.push({type:'int',value:'shareNum',text:'第几次推荐购买',dictCode:''})
+        fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'shopId',text:'商品标识',dictTable:"common_shop", dictText:'title', dictCode:'id'})
         fieldList.push({type:'string',value:'kuai',text:'快递公司',dictCode:''})
         fieldList.push({type:'string',value:'wuliu',text:'物流订单',dictCode:''})
         fieldList.push({type:'string',value:'subText',text:'订单材质',dictCode:''})
-        fieldList.push({type:'Text',value:'orderDetails',text:'下单须知',dictCode:''})
         fieldList.push({type:'int',value:'payType',text:'支付方式',dictCode:''})
-        fieldList.push({type:'string',value:'couponId',text:'优惠券标识',dictCode:''})
+        fieldList.push({type:'sel_search',value:'couponId',text:'优惠券标识',dictTable:"common_coupon", dictText:'money', dictCode:'id'})
         fieldList.push({type:'BigDecimal',value:'couponPrice',text:'优惠价格',dictCode:''})
         this.superFieldList = fieldList
       }
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue
index 528c8e1..7d4f3e9 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue
@@ -10,7 +10,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="支付状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
-              <a-input-number v-model="model.state" placeholder="请输入支付状态" style="width: 100%" />
+              <j-dict-select-tag type="list" v-model="model.state" dictCode="order_state" placeholder="请选择支付状态" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -50,27 +50,12 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <a-input v-model="model.userId" placeholder="请输入用户"  ></a-input>
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="商品标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
-              <a-input v-model="model.shopId" placeholder="请输入商品标识"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="商品类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopState">
-              <j-dict-select-tag type="list" v-model="model.shopState" dictCode="shop_type" placeholder="请选择商品类型" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="推荐购买会员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shareId">
-              <a-input v-model="model.shareId" placeholder="请输入推荐购买会员"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="第几次推荐购买" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shareNum">
-              <a-input-number v-model="model.shareNum" placeholder="请输入第几次推荐购买" style="width: 100%" />
+              <j-search-select-tag v-model="model.shopId" dict="common_shop,title,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -88,11 +73,6 @@
               <a-input v-model="model.subText" placeholder="请输入订单材质"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="下单须知" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderDetails">
-              <a-input v-model="model.orderDetails" placeholder="请输入下单须知"  ></a-input>
-            </a-form-model-item>
-          </a-col>
           <a-col :span="24">
             <a-form-model-item label="支付方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payType">
               <a-input-number v-model="model.payType" placeholder="请输入支付方式" style="width: 100%" />
@@ -100,7 +80,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="优惠券标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="couponId">
-              <a-input v-model="model.couponId" placeholder="请输入优惠券标识"  ></a-input>
+              <j-search-select-tag v-model="model.couponId" dict="common_coupon,money,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts
index ef7e4d6..303733f 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts
@@ -5,6 +5,12 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
+    title: '创建日期',
+    align:"center",
+    sorter: true,
+    dataIndex: 'createTime'
+   },
+   {
     title: '标题',
     align:"center",
     dataIndex: 'title'
@@ -12,7 +18,7 @@ export const columns: BasicColumn[] = [
    {
     title: '支付状态',
     align:"center",
-    dataIndex: 'state'
+    dataIndex: 'state_dictText'
    },
    {
     title: '价格',
@@ -52,27 +58,12 @@ export const columns: BasicColumn[] = [
    {
     title: '用户',
     align:"center",
-    dataIndex: 'userId'
+    dataIndex: 'userId_dictText'
    },
    {
     title: '商品标识',
     align:"center",
-    dataIndex: 'shopId'
-   },
-   {
-    title: '商品类型',
-    align:"center",
-    dataIndex: 'shopState_dictText'
-   },
-   {
-    title: '推荐购买会员',
-    align:"center",
-    dataIndex: 'shareId'
-   },
-   {
-    title: '第几次推荐购买',
-    align:"center",
-    dataIndex: 'shareNum'
+    dataIndex: 'shopId_dictText'
    },
    {
     title: '快递公司',
@@ -89,11 +80,6 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'subText'
    },
-   {
-    title: '下单须知',
-    align:"center",
-    dataIndex: 'orderDetails'
-   },
    {
     title: '支付方式',
     align:"center",
@@ -102,7 +88,7 @@ export const columns: BasicColumn[] = [
    {
     title: '优惠券标识',
     align:"center",
-    dataIndex: 'couponId'
+    dataIndex: 'couponId_dictText'
    },
    {
     title: '优惠价格',
@@ -113,11 +99,11 @@ export const columns: BasicColumn[] = [
 //查询数据
 export const searchFormSchema: FormSchema[] = [
 	{
-      label: "商品类型",
-      field: "shopState",
+      label: "支付状态",
+      field: "state",
       component: 'JDictSelectTag',
       componentProps:{
-          dictCode:"shop_type"
+          dictCode:"order_state"
       },
       colProps: {span: 6},
  	},
@@ -132,7 +118,10 @@ export const formSchema: FormSchema[] = [
   {
     label: '支付状态',
     field: 'state',
-    component: 'InputNumber',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"order_state"
+     },
   },
   {
     label: '价格',
@@ -172,30 +161,18 @@ export const formSchema: FormSchema[] = [
   {
     label: '用户',
     field: 'userId',
-    component: 'Input',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"han_hai_member,nick_name,id"
+    },
   },
   {
     label: '商品标识',
     field: 'shopId',
-    component: 'Input',
-  },
-  {
-    label: '商品类型',
-    field: 'shopState',
-    component: 'JDictSelectTag',
+    component: 'JSearchSelect',
     componentProps:{
-        dictCode:"shop_type"
-     },
-  },
-  {
-    label: '推荐购买会员',
-    field: 'shareId',
-    component: 'Input',
-  },
-  {
-    label: '第几次推荐购买',
-    field: 'shareNum',
-    component: 'InputNumber',
+       dict:"common_shop,title,id"
+    },
   },
   {
     label: '快递公司',
@@ -212,11 +189,6 @@ export const formSchema: FormSchema[] = [
     field: 'subText',
     component: 'Input',
   },
-  {
-    label: '下单须知',
-    field: 'orderDetails',
-    component: 'Input',
-  },
   {
     label: '支付方式',
     field: 'payType',
@@ -225,7 +197,10 @@ export const formSchema: FormSchema[] = [
   {
     label: '优惠券标识',
     field: 'couponId',
-    component: 'Input',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"common_coupon,money,id"
+    },
   },
   {
     label: '优惠价格',
diff --git a/module-system/src/main/resources/application-dev.yml b/module-system/src/main/resources/application-dev.yml
index ba554db..62c33b6 100644
--- a/module-system/src/main/resources/application-dev.yml
+++ b/module-system/src/main/resources/application-dev.yml
@@ -22,8 +22,8 @@ management:
 spring:
   servlet:
     multipart:
-      max-file-size: 10MB
-      max-request-size: 10MB
+      max-file-size: 200MB
+      max-request-size: 200MB
   mail:
     host: smtp.qq.com
     username: