Commit Graph

759 Commits

Author SHA1 Message Date
gaowdong a07e864ccb 订单管理 2025-06-04 09:30:59 +08:00
sxu affb765dcf 当前菜谱 2025-06-03 16:39:09 +08:00
gaowdong 5aa087c457 订单管理 2025-06-03 16:16:13 +08:00
gaowdong efeb4be4c2 订单管理 2025-06-03 14:54:33 +08:00
gaowdong 939c73f96d Merge branch 'master' into order 2025-06-03 11:25:27 +08:00
sxu d5d155e6a0 h5预订餐 2025-06-03 11:23:39 +08:00
gaowdong 1858f252ca Merge branch 'order' into report 2025-06-03 10:45:52 +08:00
gaowdong e99d4c94e2 Merge branch 'master' into report 2025-06-03 10:45:27 +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 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 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
gaowdong 3fbe95be95 Merge branch 'master' into report 2025-06-03 09:15:25 +08:00
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
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
sxu ea5ee5ee42 test 2025-05-30 16:11:45 +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
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
gaowdong 5a658357bd Merge branch 'master' into report 2025-05-30 13:50:17 +08:00
gaowdong af3432fd7b 报表 2025-05-30 13:48:26 +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