Commit Graph

48 Commits

Author SHA1 Message Date
gaowdong e99d4c94e2 Merge branch 'master' into report 2025-06-03 10:45:27 +08:00
jjLv 8887b38b8e 食堂-菜品查询 2025-06-03 10:41:07 +08:00
sxu ad6e3932df h5预订餐 2025-06-03 10:32:39 +08:00
jjLv 9dc14fe69a 食堂-菜品查询 2025-06-03 10:20:56 +08:00
gaowdong 461447636c 报表 2025-06-03 09:45:21 +08:00
gaowdong 17b299bd75 Merge branch 'master' into report 2025-06-03 09:43:20 +08:00
gaowdong 3fbe95be95 Merge branch 'master' into report 2025-06-03 09:15:25 +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
gaowdong 03bedbb3c3 Merge branch 'master' into report 2025-05-30 16:42:02 +08:00
sxu 02fdba8d35 菜谱管理 2025-05-30 16:37:56 +08:00
gaowdong 2ba76f37a3 Merge branch 'master' into report
# 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:55:50 +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 5a658357bd Merge branch 'master' into report 2025-05-30 13:50:17 +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 3d1291a5f4 循环菜谱详情 2025-05-29 17:09:35 +08:00
sxu 5347588130 循环菜谱详情 2025-05-29 16:59:19 +08:00
sxu 04eba0757c 循环菜谱详情 2025-05-29 16:43:52 +08:00
sxu d26e771078 循环菜谱详情 2025-05-29 15:51:59 +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
jjLv fbc0b27581 食堂-营养、原料、菜品增加时间倒叙排列 2025-05-29 09:34:47 +08:00
sxu 0d11c63bf1 加会delFlag 2025-05-28 17:01:19 +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 6998d34ae8 食堂:菜品管理详情信息、设备管理、上传apk 2025-05-28 15:18:04 +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 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 e786f8d53a 新增菜谱 2025-05-28 10:20:08 +08:00
jjLv 1d4e22ca79 食堂:原料信息及原料类别 2025-05-27 15:21:49 +08:00
jjLv a777d11def 食堂:营养信息及营养类别 2025-05-27 13:35:44 +08:00
sxu 947233f79a init 2025-05-25 19:57:10 +08:00