diff --git a/src/views/accountCenter/account/tradeRecords/index.vue b/src/views/accountCenter/account/tradeRecords/index.vue
index 587c3016..95542974 100644
--- a/src/views/accountCenter/account/tradeRecords/index.vue
+++ b/src/views/accountCenter/account/tradeRecords/index.vue
@@ -82,10 +82,10 @@
         <el-table-column label="用户手机号" align="center" prop="phone" :show-overflow-tooltip="true" />
         <el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" /> 
         <el-table-column label="操作员" align="center" prop="createBy" :show-overflow-tooltip="true" />
-        <el-table-column label="操作员事件" align="center" prop="type" :show-overflow-tooltip="true">
+        <el-table-column label="操作员事件" align="center" prop="operationType" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span v-if="scope.row.type==0">正常</span>
-            <span v-if="scope.row.type==1">停用</span>
+            <span v-if="scope.row.operationType==0">正常</span>
+            <span v-if="scope.row.operationType==1">停用</span>
           </template>
         </el-table-column> 
         <el-table-column label="操作时间" align="center" prop="createTime" :show-overflow-tooltip="true" /> 
diff --git a/src/views/base/canteenStall/canteen/index.vue b/src/views/base/canteenStall/canteen/index.vue
index eda8240d..359d0913 100644
--- a/src/views/base/canteenStall/canteen/index.vue
+++ b/src/views/base/canteenStall/canteen/index.vue
@@ -47,17 +47,17 @@
         </el-table-column>
         <el-table-column label="食堂名称" align="center" prop="canteenName" :show-overflow-tooltip="true" width="150" fixed="left"/>
         <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="180"/>
-        <el-table-column label="负责人" align="center" prop="director" :show-overflow-tooltip="true" width="120"/>
+        <el-table-column label="负责人" align="center" prop="manager" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="联系电话" align="center" prop="contactTel" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="营业状态" align="center" prop="businessState" :show-overflow-tooltip="true" width="80">
+        <el-table-column label="营业状态" align="center" prop="bizState" :show-overflow-tooltip="true" width="80">
           <template slot-scope="scope">
-            <span v-if="scope.row.businessState==1">休息</span>
-            <span v-if="scope.row.businessState==2">营业</span>
+            <span v-if="scope.row.bizState==1">休息</span>
+            <span v-if="scope.row.bizState==2">营业</span>
           </template> 
         </el-table-column>
-        <el-table-column label="营业时间" align="center" prop="startBusinessTime" :show-overflow-tooltip="true" width="180">
+        <el-table-column label="营业时间" align="center" prop="bizStartTime" :show-overflow-tooltip="true" width="180">
           <template slot-scope="scope">
-            {{ scope.row.startBusinessTime }}-{{ scope.row.endBusinessTime }}
+            {{ scope.row.bizStartTime }}-{{ scope.row.bizEndTime }}
           </template> 
         </el-table-column>
         <el-table-column label="食堂图片" align="center" prop="imgUrl">
@@ -135,7 +135,7 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="营业状态">
-                    <el-select v-model="baseForm.businessState" placeholder="请选择营业状态" style="width: 100%;" clearable>
+                    <el-select v-model="baseForm.bizState" placeholder="请选择营业状态" style="width: 100%;" clearable>
                       <el-option label="休息" :value="1" />
                       <el-option label="营业" :value="2" />
                     </el-select> 
@@ -144,9 +144,9 @@
               </el-row>
               <el-row>
                 <el-col :span="12">
-                  <el-form-item label="负责人" prop="director">
+                  <el-form-item label="负责人" prop="manager">
                     <el-input
-                      v-model="baseForm.director"
+                      v-model="baseForm.manager"
                       type="text" clearable
                       placeholder="请输入负责人"
                       maxlength="30"
@@ -257,9 +257,9 @@
           "canteenName": "",
           "canteenNum": "",
           "contactTel": "",
-          "director": "",
-          "endBusinessTime": "",
-          "startBusinessTime": "",  
+          "manager": "",
+          "bizEndTime": "",
+          "bizStartTime": "",  
           "imgUrl": "",
         },//基础设置
         rangeTime:["08:00:00", "18:00:00"],//营业时间
@@ -372,7 +372,7 @@
                   this.fileList=[]
                   this.checkUrlList=[]
                 }
-                this.rangeTime=[response.data.startBusinessTime, response.data.endBusinessTime] 
+                this.rangeTime=[response.data.bizStartTime, response.data.bizEndTime] 
                 this.open = true;
                 this.title = "修改";
             });
@@ -392,8 +392,8 @@
             console.log(this.rangeTime)
             this.$refs["baseForm"].validate(valid => {//基本设置表单校验
             if (valid) {
-              this.baseForm.startBusinessTime=this.rangeTime[0]
-              this.baseForm.endBusinessTime=this.rangeTime[1]
+              this.baseForm.bizStartTime=this.rangeTime[0]
+              this.baseForm.bizEndTime=this.rangeTime[1]
               this.baseForm.imgUrl = this.checkUrlList[0] 
               let param = this.baseForm
               if (this.canteenId != "") {
diff --git a/src/views/base/canteenStall/stall/index.vue b/src/views/base/canteenStall/stall/index.vue
index 35849b40..948a79eb 100644
--- a/src/views/base/canteenStall/stall/index.vue
+++ b/src/views/base/canteenStall/stall/index.vue
@@ -57,12 +57,12 @@
       <el-table-column label="档口名称" align="center" prop="stallName" :show-overflow-tooltip="true" width="180" fixed="left"/>
       <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="160"/>
       <el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" width="160"/>
-      <el-table-column label="负责人" align="center" prop="director" :show-overflow-tooltip="true" width="80"/>
+      <el-table-column label="负责人" align="center" prop="manager" :show-overflow-tooltip="true" width="80"/>
       <el-table-column label="联系电话" align="center" prop="contactTel" :show-overflow-tooltip="true" width="100"/>
-      <el-table-column label="档口状态" align="center" prop="businessState" :show-overflow-tooltip="true" width="80">
+      <el-table-column label="档口状态" align="center" prop="bizState" :show-overflow-tooltip="true" width="80">
         <template slot-scope="scope">
-          <span v-if="scope.row.businessState==1">休息</span>
-          <span v-if="scope.row.businessState==2">营业</span>
+          <span v-if="scope.row.bizState==1">休息</span>
+          <span v-if="scope.row.bizState==2">营业</span>
         </template> 
       </el-table-column>
       <el-table-column label="营业时间" align="center" prop="bizStartTime" :show-overflow-tooltip="true" width="180">
@@ -70,8 +70,8 @@
           {{ scope.row.bizStartTime }}-{{ scope.row.bizEndTime }}
         </template> 
       </el-table-column>
-      <el-table-column label="线上流水号前缀" align="center" prop="onLineMealCodePrefix" :show-overflow-tooltip="true" width="120"/>
-      <el-table-column label="线下流水号前缀" align="center" prop="offLineMealCodePrefix" :show-overflow-tooltip="true" width="120"/>
+      <!-- <el-table-column label="线上流水号前缀" align="center" prop="onLineMealCodePrefix" :show-overflow-tooltip="true" width="120"/>
+      <el-table-column label="线下流水号前缀" align="center" prop="offLineMealCodePrefix" :show-overflow-tooltip="true" width="120"/> -->
       <el-table-column label="档口图片" align="center" prop="imgUrl" width="100">
         <template slot-scope="scope"> 
           <img :src="scope.row.imgUrl" v-if="scope.row.imgUrl" alt="" style="width: 80px;height: 40px;" @click="openImg(scope.row)">
@@ -141,9 +141,9 @@
                 </el-form-item>
               </el-col>  
               <el-col :span="12">
-                <el-form-item label="负责人" prop="director">
+                <el-form-item label="负责人" prop="manager">
                   <el-input
-                      v-model="baseForm.director"
+                      v-model="baseForm.manager"
                       type="text" clearable
                       placeholder="请输入负责人"
                       maxlength="30"
@@ -171,13 +171,13 @@
               </el-col> 
               <el-col :span="12">
                   <el-form-item label="营业状态">
-                    <el-select v-model="baseForm.businessState" placeholder="请选择营业状态" style="width: 100%;" clearable>
+                    <el-select v-model="baseForm.bizState" placeholder="请选择营业状态" style="width: 100%;" clearable>
                       <el-option label="休息" :value="1" />
                       <el-option label="营业" :value="2" />
                     </el-select> 
                   </el-form-item> 
               </el-col> 
-              <el-col :span="12">
+              <!-- <el-col :span="12">
                 <el-form-item label="线上流水号前缀" prop="onLineMealCodePrefix"> 
                   <el-input v-model="baseForm.onLineMealCodePrefix" placeholder="请输入线上流水号前缀" maxlength="30" clearable/>
                 </el-form-item>
@@ -186,7 +186,7 @@
                 <el-form-item label="线下流水号前缀" prop="offLineMealCodePrefix"> 
                   <el-input v-model="baseForm.offLineMealCodePrefix" placeholder="请输入线下流水号前缀" maxlength="30" clearable/>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row>
               <el-col :span="12">
@@ -379,7 +379,7 @@ export default {
         "canteenId": "",  
         "stallName": "", 
         "contactTel": "",
-        "director": "",
+        "manager": "",
         "bizEndTime": "",
         "bizStartTime": "", 
         "imgUrl": "", 
diff --git a/src/views/superstore/super/index.vue b/src/views/superstore/super/index.vue
index 4850e2d0..0d97d6d8 100644
--- a/src/views/superstore/super/index.vue
+++ b/src/views/superstore/super/index.vue
@@ -58,7 +58,7 @@
             <span v-else>无</span>
           </template>
         </el-table-column> 
-        <el-table-column label="联系人" align="center" prop="userName" :show-overflow-tooltip="true" width="100"/>
+        <el-table-column label="管理员" align="center" prop="manager" :show-overflow-tooltip="true" width="100"/>
         <el-table-column label="更新时间" align="center" prop="updateTime" :show-overflow-tooltip="true" width="160"/>
         <el-table-column label="收款码" align="center" prop="payCodeUrl" :show-overflow-tooltip="true" width="120">
           <template slot-scope="scope">
@@ -128,8 +128,8 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="联系人" prop="userName"> 
-                    <el-input  v-model="baseForm.userName" placeholder="请输入联系人" maxlength="30" clearable/>
+                  <el-form-item label="管理员" prop="manager"> 
+                    <el-input  v-model="baseForm.manager" placeholder="请输入管理员" maxlength="30" clearable/>
                   </el-form-item>
                 </el-col>  
                 <el-col :span="12">