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 |
|
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 |