From b5dbdba76e9fcf98e679487e1482c4b20775f49d Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 6 May 2025 10:54:57 +0800
Subject: [PATCH 1/2] 1

---
 src/views/canteen/canteenDailyMenu/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/canteen/canteenDailyMenu/index.vue b/src/views/canteen/canteenDailyMenu/index.vue
index 4995e26..b1574ee 100644
--- a/src/views/canteen/canteenDailyMenu/index.vue
+++ b/src/views/canteen/canteenDailyMenu/index.vue
@@ -66,7 +66,7 @@
 					</div>
 				</tr>
 				<tr class="food">
-					<td v-if="!loading" class="text-center" @click="addFood(3)">晚餐</td>
+ 					<td v-if="!loading" class="text-center" @click="addFood(3)">晚餐</td>
 					<div class="food_list">
 						<td class="food_list_item" v-for="(item, index) in foodData3" :key="index" @click="delteData(item.tid)">
 							<el-image style="width: 80px; height: 80px" loading="lazy" :src="imageBaseUrl + item.picUrl" fit="cover" />

From c1425d34675102bb0563a9d5db70c3e3dec96b05 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 6 May 2025 22:29:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/canteen/canteenDailyMenu/copyDialog.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/canteen/canteenDailyMenu/copyDialog.vue b/src/views/canteen/canteenDailyMenu/copyDialog.vue
index 902f13b..ca66b11 100644
--- a/src/views/canteen/canteenDailyMenu/copyDialog.vue
+++ b/src/views/canteen/canteenDailyMenu/copyDialog.vue
@@ -61,7 +61,7 @@
 <script setup lang="ts">
 import { ref, reactive } from 'vue'
 import type { FormInstance } from 'element-plus'
-import { pageJoin } from "/@/api/wallet/mch-manage"
+import { select } from "/@/api/wallet/mch-manage"
 import { useMessage } from "/@/hooks/message"
 import { copyMenu } from "/@/api/canteen/canteenDailyMenu"
 
@@ -87,7 +87,7 @@ const emit = defineEmits(['success'])
 // 获取商户列表
 const getMerchantList = async () => {
   try {
-    const res = await pageJoin({ current: 1, size: 9999, types: 1 })
+    const res = await select({ current: 1, size: 9999, types: 1 })
     merchantList.value = res.data.records
   } catch (error) {
     console.error('获取商户列表失败:', error)