Commit Graph

101 Commits

Author SHA1 Message Date
sxu 399321710b 删除cook_dishes_base 2025-06-04 10:36:51 +08:00
sxu 6c9aa332d6 删除cook_dishes_base 2025-06-04 10:17:31 +08:00
sxu affb765dcf 当前菜谱 2025-06-03 16:39:09 +08:00
gaowdong efeb4be4c2 订单管理 2025-06-03 14:54:33 +08:00
gaowdong b34d0fd344 Merge branch 'master' into order 2025-06-03 10:44:31 +08:00
jjLv 8887b38b8e 食堂-菜品查询 2025-06-03 10:41:07 +08:00
gaowdong 81038d500f Merge branch 'master' into order 2025-06-03 10:34:30 +08:00
sxu ad6e3932df h5预订餐 2025-06-03 10:32:39 +08:00
sxu 0757e67d56 Merge remote-tracking branch 'origin/master' 2025-06-03 10:28:34 +08:00
sxu 72dc664e10 删除超市原料时加保护 2025-06-03 10:28:27 +08:00
gaowdong 91e0226993 订单管理 2025-06-03 10:27:04 +08:00
jjLv 9dc14fe69a 食堂-菜品查询 2025-06-03 10:20:56 +08:00
sxu cba0e5bc7b 删除超市原料时加保护 2025-06-03 09:56:19 +08:00
gaowdong 43dd9f2392 Merge branch 'master' into order 2025-06-03 09:42:24 +08:00
gaowdong 92681d878f Merge branch 'master' into order 2025-06-03 09:41:43 +08:00
sxu 70aa1c50fa 商品上架管理 2025-06-03 09:29:51 +08:00
sxu 45bdb1d8c4 菜谱管理 2025-06-01 23:19:12 +08:00
sxu 868b02929e 菜谱管理 2025-06-01 06:56:32 +08:00
sxu 596c7d16fd 菜谱管理 2025-05-31 10:08:03 +08:00
sxu 33373d50f9 菜谱管理 2025-05-30 18:26:40 +08:00
sxu 8f1dc34334 菜谱管理 2025-05-30 16:46:33 +08:00
sxu 02fdba8d35 菜谱管理 2025-05-30 16:37:56 +08:00
gaowdong ffb9e77e7a Merge branch 'master' into order
# Conflicts:
#	bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookRecipeDishesMapper.java
#	bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeDishesMapper.xml
2025-05-30 15:54:04 +08:00
sxu d65cfe2156 fix conflict 2025-05-30 15:23:24 +08:00
liux d6cf3afd10 H5菜谱功能 2025-05-30 15:07:36 +08:00
sxu edde32e8e2 test 2025-05-30 14:57:28 +08:00
gaowdong d9c05e4569 Merge branch 'master' into order 2025-05-30 13:50:57 +08:00
jjLv ae9e074818 食堂-菜品导入-检查、导入 2025-05-30 13:30:41 +08:00
gaowdong 63c88cf464 订单管理 2025-05-30 10:20:19 +08:00
jjLv 7ea6126c2d 食堂-菜品导入-检查 2025-05-30 09:23:29 +08:00
sxu fe0b702c7f 当前菜谱 2025-05-29 21:45:23 +08:00
sxu 88ba682284 fix bug 2025-05-29 18:05:26 +08:00
sxu 3d1291a5f4 循环菜谱详情 2025-05-29 17:09:35 +08:00
sxu 5347588130 循环菜谱详情 2025-05-29 16:59:19 +08:00
sxu 98b84d2fd2 Merge remote-tracking branch 'origin/master' 2025-05-29 16:43:59 +08:00
sxu 04eba0757c 循环菜谱详情 2025-05-29 16:43:52 +08:00
jjLv 0c325cf111 食堂-设备问题修改 2025-05-29 16:21:20 +08:00
sxu d26e771078 循环菜谱详情 2025-05-29 15:51:59 +08:00
jjLv 3ae6e86cc7 Merge remote-tracking branch 'origin/master' 2025-05-29 15:19:15 +08:00
jjLv 90decda985 食堂-双屏机接口 2025-05-29 15:19:00 +08:00
sxu 4dc5be1f29 循环菜谱详情 2025-05-29 14:57:32 +08:00
sxu 6337c37f2e 当前菜谱bind 2025-05-29 14:13:29 +08:00
sxu d9bfcc0c30 当前菜谱bind 2025-05-29 13:51:22 +08:00
sxu d62a462c9a 当前菜谱 2025-05-29 13:23:00 +08:00
sxu 6bb04622f2 Merge remote-tracking branch 'origin/master' 2025-05-29 10:17:07 +08:00
sxu d19574fc2c fix bug 2025-05-29 10:17:00 +08:00
jjLv 71bcaa0e07 食堂-根据阿里规约扫描对问题进行修复 2025-05-29 10:15:27 +08:00
sxu 742501a9fc Merge remote-tracking branch 'origin/master' 2025-05-29 10:02:41 +08:00
sxu 4fb078bbad fix bug 2025-05-29 10:02:39 +08:00
jjLv fbc0b27581 食堂-营养、原料、菜品增加时间倒叙排列 2025-05-29 09:34:47 +08:00