diff --git a/public/template/批量新增菜品模板.xlsx b/public/template/批量新增菜品模板.xlsx
new file mode 100644
index 00000000..9426f861
Binary files /dev/null and b/public/template/批量新增菜品模板.xlsx differ
diff --git a/src/api/accountCenter/butie.js b/src/api/accountCenter/butie.js
index cee601cf..8a20a808 100644
--- a/src/api/accountCenter/butie.js
+++ b/src/api/accountCenter/butie.js
@@ -117,7 +117,10 @@ export function accSubsidyRechargePageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
 //补贴明细-撤销操作
@@ -153,7 +156,10 @@ export function accSubsidyClearPageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 //补贴撤销明细
@@ -165,7 +171,10 @@ export function accSubsidyRepealPageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 //补贴未到账明细
@@ -177,7 +186,10 @@ export function accSubsidyHandReceivePageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 //补贴未到账明细-批量到账操作
@@ -189,7 +201,10 @@ export function accSubsidyHandReceiveBatchGrantApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 //补贴未到账明细-批量撤销操作
@@ -201,7 +216,10 @@ export function batchAccSubsidyRepealApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 
@@ -216,7 +234,10 @@ export function accountSubsidyCustPageApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+        pageNum:data.pageNum,
+        pageSize:data.pageSize
+      }
     })
 } 
  
diff --git a/src/api/accountCenter/consume.js b/src/api/accountCenter/consume.js
index b3f088f8..2a0f5be0 100644
--- a/src/api/accountCenter/consume.js
+++ b/src/api/accountCenter/consume.js
@@ -57,7 +57,10 @@ export function consumeDeductSingleApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+        pageNum:data.pageNum,
+        pageSize:data.pageSize
+      }
     })
 } 
 
@@ -70,7 +73,10 @@ export function accountConsumeCustPageApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+        pageNum:data.pageNum,
+        pageSize:data.pageSize
+      }
     })
 } 
 // 消费类型汇总-用户类别
@@ -82,7 +88,10 @@ export function accountConsumePsnPageApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+        pageNum:data.pageNum,
+        pageSize:data.pageSize
+      }
     })
 } 
 // 消费类型汇总-用户组织
@@ -94,7 +103,10 @@ export function accountConsumeOrganizationPageApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+        pageNum:data.pageNum,
+        pageSize:data.pageSize
+      }
     })
 }
 
@@ -107,7 +119,10 @@ export function walletConsumeCustPageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 // 消费钱包汇总-用户类别
@@ -119,7 +134,10 @@ export function walletConsumePsnPageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 // 消费钱包汇总-用户组织
@@ -131,7 +149,10 @@ export function walletConsumeOrganizationPageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
 
diff --git a/src/api/accountCenter/freeze.js b/src/api/accountCenter/freeze.js
index b30cfe2e..f36b8215 100644
--- a/src/api/accountCenter/freeze.js
+++ b/src/api/accountCenter/freeze.js
@@ -58,7 +58,10 @@ export function accFrozenPageApi(data) {
         "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
     })
   } 
 
@@ -71,7 +74,10 @@ export function accUnfrozenPageApi(data) {
         "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
     })
   } 
 
diff --git a/src/api/accountCenter/manager.js b/src/api/accountCenter/manager.js
index 2f67bdf1..2c34b255 100644
--- a/src/api/accountCenter/manager.js
+++ b/src/api/accountCenter/manager.js
@@ -23,7 +23,10 @@ export function accInfoPageApi(data) {
         "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+        pageNum:data.pageNum,
+        pageSize:data.pageSize
+      }
     })
   }
 
diff --git a/src/api/accountCenter/traderecords.js b/src/api/accountCenter/traderecords.js
index 7ae62d12..7e74993c 100644
--- a/src/api/accountCenter/traderecords.js
+++ b/src/api/accountCenter/traderecords.js
@@ -9,7 +9,10 @@ export function accInfoOperationListApi(data) {
       "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
 
@@ -22,7 +25,10 @@ export function accInfoWalletHistoryApi(data) {
       "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
  
@@ -35,6 +41,9 @@ export function orderHistoryListApi(data) {
       "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
diff --git a/src/api/base/mobile.js b/src/api/base/mobile.js
index 3dfa70db..00dd0d85 100644
--- a/src/api/base/mobile.js
+++ b/src/api/base/mobile.js
@@ -22,7 +22,10 @@ export function getPlaintByPageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
 // 回复-投诉建议
@@ -48,7 +51,10 @@ export function getOrderEvaluatePageApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
     })
   }
   // 订单评价-回复
@@ -99,7 +105,10 @@ export function getEvaluateCountPageApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
     })
   }
  
diff --git a/src/api/device/index.js b/src/api/device/index.js
index cadd9845..2021e055 100644
--- a/src/api/device/index.js
+++ b/src/api/device/index.js
@@ -10,7 +10,10 @@ export function getDeviceListPageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 
diff --git a/src/api/dish/dish.js b/src/api/dish/dish.js
index 63c48194..d8bd24fb 100644
--- a/src/api/dish/dish.js
+++ b/src/api/dish/dish.js
@@ -78,7 +78,10 @@ export function getMenuDishesListApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
     })
 }
 // 菜品列表-新增
diff --git a/src/api/dish/menu.js b/src/api/dish/menu.js
index 2dae2649..ba66d826 100644
--- a/src/api/dish/menu.js
+++ b/src/api/dish/menu.js
@@ -44,7 +44,10 @@ export function getDishesByTypePageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
 
@@ -68,7 +71,10 @@ export function getPageRecipeListApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
     })
 }
  
diff --git a/src/api/reportCenter/index.js b/src/api/reportCenter/index.js
index be810a3a..cbee97db 100644
--- a/src/api/reportCenter/index.js
+++ b/src/api/reportCenter/index.js
@@ -9,7 +9,10 @@ export function reportTradFlowListApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
     })
 } 
 
@@ -22,7 +25,10 @@ export function reportAccRechargeListApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 
@@ -35,7 +41,10 @@ export function reportAccWithdrawListApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 
@@ -48,7 +57,10 @@ export function reportTradeOperatingListApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 
@@ -61,7 +73,10 @@ export function reportTradeCanteenListApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 
@@ -74,7 +89,10 @@ export function reportTradeDeviceListApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
 
@@ -87,7 +105,10 @@ export function reportTradeUserListApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
 
@@ -100,7 +121,10 @@ export function reportTradeGoodsListApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
 
diff --git a/src/views/dish/dish/index.vue b/src/views/dish/dish/index.vue
index 80487cce..317ac138 100644
--- a/src/views/dish/dish/index.vue
+++ b/src/views/dish/dish/index.vue
@@ -136,7 +136,7 @@
                 @click="handleBatchDel"
               >批量删除</el-button>
             </el-col> -->
-            <!-- <el-col :span="1.5">
+            <el-col :span="1.5">
               <el-upload
                   ref="upload"
                   :limit="1"
@@ -149,14 +149,19 @@
                   :on-success="handleFileSuccess" 
               >
                   <el-button
-                    type="success"
-                    plain
-                    icon="el-icon-edit"
+                    type="success"  
                     size="mini"  
                     >批量导入
                 </el-button>
-              </el-upload> 
-            </el-col>-->
+              </el-upload>
+            </el-col>
+            <el-col :span="1.5"> 
+              <el-button
+                  size="mini"
+                  @click="importTemplate" 
+                  >模板下载
+              </el-button> 
+            </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </el-row>
   
@@ -993,6 +998,7 @@
   import { getMaterialListApi } from "@/api/dish/material"; 
   import { imgUpLoadTwo } from '@/api/system/upload'
   import { getToken } from '@/utils/auth'
+  import { downloadFileByUrl } from '@/utils/download'
   export default {
     name: "Material",
     components: { Treeselect },
@@ -1132,15 +1138,15 @@
         checkUrlList: [],//图片
         checkUrlNameList: [],//图片
         dialogVisible:false,//图片弹窗
-        dialogImageUrl:"",//图片弹窗
-        //导入参数
+        dialogImageUrl:"",//图片弹窗 
+         //导入参数
         upload: {  
-            // 是否禁用上传
-            isUploading: false, 
-            // 设置上传的请求头部
-            headers: { Authorization: 'Bearer ' + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + '/smart-canteen/api/v1/menumaterial/batch/import/material',
+          // 是否禁用上传
+          isUploading: false, 
+          // 设置上传的请求头部
+          headers: { Authorization: 'Bearer ' + getToken() },
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + '/smart-canteen/menu_dishes/import/check',
         },
         materialList:[],
         materialOptions:[],
@@ -1649,6 +1655,8 @@
           this.dialogImageUrl = file.url
           this.dialogVisible = true
       }, 
+      
+      
       //批量导入
       // /api/v1/menumaterial/batch/import/material
       // 文件上传中处理
@@ -1657,11 +1665,19 @@
       },
       // 文件上传成功处理
       handleFileSuccess(response, file, fileList) { 
+        console.log(response)
           this.upload.isUploading = false
           this.$refs.upload.clearFiles()
-          this.$modal.msgSuccess("后台导入中...");
+          this.$modal.msgSuccess("后台导入中，请稍后刷新列表！");
           this.getList()
       },
+
+      /** 下载模板操作 */
+      importTemplate() {
+        let url = window.location.origin + '/glweb/template/批量新增菜品模板.xlsx';
+        console.log(url)
+        downloadFileByUrl(url)
+      },
      
       handleNumericInput(field, event) {
         const value = event;
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 0897069d..feb187a0 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1079,6 +1079,7 @@ export default {
         handleAdd() {
             this.reset()
             this.loginTypeArr.splice(0)
+            this.fileList=[]
             getUser().then((response) => {
                 this.postOptions = response.posts
                 this.roleOptions = response.roles
@@ -1103,7 +1104,11 @@ export default {
                 this.$set(this.form, 'postIds', response.postIds)
                 this.$set(this.form, 'roleIds', response.roleIds)
                 // console.log(store.getters.face)
-                this.fileList=[{url:response.data.photoUrl}]
+                if(response.data.photoUrl){
+                    this.fileList=[{url:response.data.photoUrl}]
+                }else{
+                    this.fileList=[]
+                }
                 this.checkUrlList=[response.data.photoUrl]
                 this.open = true
                 this.title = '修改用户'