Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud

src/views/canteen/canteenDailyMenu/index.vue

@@ -100,7 +100,7 @@ const weekParams = reactive({
 const weekData = reactive({
 	data: [],
 }) //时间数组
-const merchantId = ref() // 商户id
+const merchantId = ref() // 商户Id
 const merchantInfo = ref<any>([])
 
 const addFood = async (hourType: number) => {