Merge remote-tracking branch 'origin/master'

src/views/canteen/canteenDailyMenu/index.vue

@@ -1,8 +1,7 @@
 <template>
 	<div class="layout-padding" v-loading="loading">
 		<el-form-item label="商户" prop="merchantId" class="w-60 ml-10 my-6">
-			<!-- :apiParams="{ types: '1' }" -->
-			<select-mch v-model="merchantId" />
+			<select-mch v-model="merchantId" :apiParams="{ types: '1' }" />
 		</el-form-item>
 		<h1 class="mx-auto text-5xl mt-[-40px]">今日菜谱</h1>