Commit Graph

182 Commits

Author SHA1 Message Date
sxu b1cd6849e9 菜谱管理 2025-06-01 23:29:20 +08:00
sxu 45bdb1d8c4 菜谱管理 2025-06-01 23:19:12 +08:00
sxu a23ba1664e 菜谱管理 2025-06-01 07:02:14 +08:00
sxu 868b02929e 菜谱管理 2025-06-01 06:56:32 +08:00
sxu 988d3bb4a6 菜谱管理 2025-06-01 06:20:04 +08:00
sxu 070bf9c495 菜谱管理 2025-05-31 10:51:27 +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
sxu ea5ee5ee42 test 2025-05-30 16:11:45 +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 1ab1ead903 Merge branch 'master' into test0530 2025-05-30 15:05:08 +08:00
liux 3e816ed1e7 Merge remote-tracking branch 'origin/master' 2025-05-30 15:03:06 +08:00
liux b5b99545af bao 2025-05-30 15:02:50 +08:00
sxu edde32e8e2 test 2025-05-30 14:57:28 +08:00
jjLv ecc1bd8417 食堂-菜品导入-加入计价方式校验 2025-05-30 14:50:29 +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 c7904eff6c 当前菜谱 2025-05-29 21:48:34 +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 11363ccc42 循环菜谱详情 2025-05-29 17:52:14 +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
sxu 71f5e4a1c3 Merge remote-tracking branch 'origin/master' 2025-05-29 15:23:25 +08:00
sxu 0021f7dbe9 循环菜谱详情 2025-05-29 15:23:17 +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 5d6e638e49 循环菜谱详情 2025-05-29 15:13:52 +08:00
sxu 4dc5be1f29 循环菜谱详情 2025-05-29 14:57:32 +08:00
sxu 6337c37f2e 当前菜谱bind 2025-05-29 14:13:29 +08:00
sxu a3693858fe 当前菜谱bind 2025-05-29 14:09:30 +08:00
sxu d9bfcc0c30 当前菜谱bind 2025-05-29 13:51:22 +08:00
sxu d62a462c9a 当前菜谱 2025-05-29 13:23:00 +08:00
jjLv 60517d329e 食堂-根据Qodana分析报告进行修复 2025-05-29 10:31:17 +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 73466484d9 Merge remote-tracking branch 'origin/master' 2025-05-29 09:35:43 +08:00
sxu e36f962cc8 Merge remote-tracking branch 'origin/master' 2025-05-29 09:34:54 +08:00
jjLv fbc0b27581 食堂-营养、原料、菜品增加时间倒叙排列 2025-05-29 09:34:47 +08:00
sxu 5cce069146 投诉建议 2025-05-29 09:34:46 +08:00
jjLv e1e8188562 食堂-设备接口修改 2025-05-29 09:22:12 +08:00
sxu 4fa2b84b3e Merge remote-tracking branch 'origin/master' 2025-05-29 09:09:02 +08:00
sxu 9dcb1973ca 绑定 2025-05-29 09:08:57 +08:00
jjLv 3c34fdfb87 食堂-设备接口修改 2025-05-28 17:32:24 +08:00
sxu 0d11c63bf1 加会delFlag 2025-05-28 17:01:19 +08:00
sxu 7130c44c64 获取菜谱计划-菜谱详情 2025-05-28 16:25:28 +08:00
sxu bb28946804 获取菜谱计划-菜谱详情 2025-05-28 16:24:27 +08:00
sxu 09368ba4aa 获取菜谱计划-菜谱详情 2025-05-28 16:21:55 +08:00
sxu 5956bf5be1 Merge remote-tracking branch 'origin/master' 2025-05-28 16:00:09 +08:00
sxu 9acc81b51f 获取菜谱计划-菜谱详情 2025-05-28 15:52:44 +08:00
sxu ace01ae9fd 获取指定日期菜谱计划菜品详情 2025-05-28 15:38:10 +08:00
jjLv 93aa13a9fa 食堂-双屏机:更新设备在线状态 2025-05-28 15:32:20 +08:00
jjLv 6998d34ae8 食堂:菜品管理详情信息、设备管理、上传apk 2025-05-28 15:18:04 +08:00
gaowdong 3c08b4b234 账户管理 2025-05-28 14:11:44 +08:00
sxu b3e5e86c69 Merge branch 'master' into rs0527 2025-05-28 13:07:48 +08:00
sxu 7edc50bf5b 统计菜谱菜品数量 2025-05-28 13:06:21 +08:00
sxu e706c925c9 删除菜谱 2025-05-28 12:52:05 +08:00
sxu a63c4aac32 删除菜谱 2025-05-28 12:43:15 +08:00
sxu c7496379ef 更新菜谱 2025-05-28 12:27:29 +08:00
sxu bf073b2f5a 更新菜谱 2025-05-28 12:17:30 +08:00
sxu f791312df4 更新菜谱 2025-05-28 11:19:51 +08:00
jjLv 4d4a6ee86d 食堂:菜品管理 2025-05-28 10:59:49 +08:00
sxu fec8f85805 更新菜谱 2025-05-28 10:49:46 +08:00
sxu e786f8d53a 新增菜谱 2025-05-28 10:20:08 +08:00
sxu a6d48a4b08 新增菜谱 2025-05-28 10:17:03 +08:00
sxu def2530573 新增菜谱 2025-05-28 10:01:49 +08:00
sxu 8708c17555 新增菜谱 2025-05-28 08:51:41 +08:00
sxu dde1a45475 新增菜谱 2025-05-27 23:27:32 +08:00
sxu 03ef97918b 新增菜谱 2025-05-27 23:20:07 +08:00
sxu abb944ab32 新增菜谱 2025-05-27 23:17:51 +08:00
sxu 127a8c6c11 新增菜谱 2025-05-27 23:14:05 +08:00
sxu 001eb9ba6f 新增菜谱 2025-05-27 23:09:54 +08:00
sxu 774bc46626 新增菜谱 2025-05-27 22:37:09 +08:00
sxu 5ba34e5b7f 新增菜谱 2025-05-27 22:33:55 +08:00
sxu 1bb5aadfb8 新增菜谱 2025-05-27 22:29:35 +08:00
sxu adcdd0086b 食堂投诉建议 2025-05-27 18:38:38 +08:00
sxu eb53ade810 删除多余类 2025-05-27 18:25:18 +08:00
sxu ee29302e6c 食堂投诉建议 2025-05-27 18:18:01 +08:00
gaowdong 5976461505 Merge remote-tracking branch 'origin/master' 2025-05-27 17:39:13 +08:00
gaowdong 0003dfe7c8 账户管理 2025-05-27 17:37:54 +08:00
sxu a9088400b0 Merge remote-tracking branch 'origin/master' 2025-05-27 17:28:58 +08:00
sxu 0ebfb1e6be 人脸主键 2025-05-27 17:28:50 +08:00
jjLv 5d65c895b9 食堂:营养信息新增修改接口更变 2025-05-27 17:25:44 +08:00
jjLv 1d4e22ca79 食堂:原料信息及原料类别 2025-05-27 15:21:49 +08:00
gaowdong 59e3a032f5 账户管理 2025-05-27 13:47:34 +08:00
jjLv a777d11def 食堂:营养信息及营养类别 2025-05-27 13:35:44 +08:00
sxu e3f241575f 食堂投诉和建议 2025-05-27 12:57:17 +08:00