 sxu
|
5fb63050a4
|
订单评价
|
2025-06-05 14:37:37 +08:00 |
skjia
|
7f584f958c
|
Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-JYY-Smart-Canteen
|
2025-06-05 14:01:39 +08:00 |
|
skjia
|
918ce083e3
|
jsk 健康
|
2025-06-05 13:59:49 +08:00 |
|
sxu
|
6959ea6699
|
人脸删除
|
2025-06-05 13:56:01 +08:00 |
|
sxu
|
f563492a17
|
Merge remote-tracking branch 'origin/master'
|
2025-06-05 13:46:26 +08:00 |
|
skjia
|
6bceddc8de
|
jsk 健康
|
2025-06-05 13:45:26 +08:00 |
|
sxu
|
83bb3f0d38
|
人脸删除
|
2025-06-05 13:45:08 +08:00 |
|
sxu
|
d131a953da
|
更新菜谱发送mq
|
2025-06-05 13:20:18 +08:00 |
|
skjia
|
d0ba4aaf20
|
jsk 健康
|
2025-06-05 13:08:01 +08:00 |
|
sxu
|
59ff8e5afe
|
Merge remote-tracking branch 'origin/master'
|
2025-06-05 11:29:59 +08:00 |
|
sxu
|
7062b99647
|
更新菜谱发送mq
|
2025-06-05 11:29:20 +08:00 |
|
skjia
|
72088fc2ca
|
jsk 健康
|
2025-06-05 11:28:58 +08:00 |
|
sxu
|
565e63072b
|
更新菜谱发送mq
|
2025-06-05 11:21:41 +08:00 |
|
sxu
|
c89cb30e93
|
菜谱导入
|
2025-06-05 10:50:34 +08:00 |
|
sxu
|
06cd735852
|
Merge remote-tracking branch 'origin/master'
|
2025-06-05 09:11:06 +08:00 |
 jjLv
|
69aea9f0bd
|
Merge remote-tracking branch 'origin/master'
|
2025-06-04 17:42:26 +08:00 |
|
jjLv
|
dd5053d395
|
双屏机获取余额等内容修改、更新设备在线状态位置变更
|
2025-06-04 17:40:50 +08:00 |
gaowdong
|
3a0b482d88
|
Merge branch 'master' into report
|
2025-06-04 17:23:33 +08:00 |
|
gaowdong
|
a3c6f9d218
|
订单管理
|
2025-06-04 15:07:48 +08:00 |
|
sxu
|
50390b892f
|
Merge remote-tracking branch 'origin/master'
|
2025-06-04 11:33:59 +08:00 |
|
sxu
|
2d0fb9838d
|
超市分页
|
2025-06-04 11:33:44 +08:00 |
|
jjLv
|
cd6ec9e759
|
双屏机获取设备信息修改-去除nacos中的APP_ID和APP_KEY
|
2025-06-04 11:24:31 +08:00 |
|
jjLv
|
2b0d7169e3
|
双屏机代码处理优化
|
2025-06-04 11:13:46 +08:00 |
|
sxu
|
b5388e9510
|
删除cook_dishes_base
|
2025-06-04 11:05:30 +08:00 |
|
sxu
|
f2cacd8646
|
删除cook_dishes_base
|
2025-06-04 10:43:23 +08:00 |
|
sxu
|
399321710b
|
删除cook_dishes_base
|
2025-06-04 10:36:51 +08:00 |
|
sxu
|
ed541c9302
|
删除cook_dishes_base
|
2025-06-04 10:34:27 +08:00 |
|
sxu
|
815a9e5b09
|
Merge branch 'master' into removedishbase
|
2025-06-04 10:31:26 +08:00 |
|
gaowdong
|
3960eebac2
|
订单管理
|
2025-06-04 10:29:41 +08:00 |
|
sxu
|
6c9aa332d6
|
删除cook_dishes_base
|
2025-06-04 10:17:31 +08:00 |
|
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 |
|
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 |
|
sxu
|
00a1b7394a
|
商品单位-食堂评价
|
2025-05-27 12:33:35 +08:00 |
|
sxu
|
b8c05fb4cf
|
商品单位-仓库管理
|
2025-05-27 09:55:54 +08:00 |
|
sxu
|
0b183be6d5
|
商品单位-仓库管理
|
2025-05-27 09:48:28 +08:00 |
|
sxu
|
349bc91fc2
|
商品单位-仓库管理
|
2025-05-27 09:06:05 +08:00 |
|
sxu
|
0d4f3db67f
|
Merge remote-tracking branch 'origin/master'
|
2025-05-26 18:00:18 +08:00 |
|
sxu
|
b85adc42d2
|
商品单位-仓库管理
|
2025-05-26 18:00:14 +08:00 |
|
gaowdong
|
ecd11efce1
|
账户管理
|
2025-05-26 17:37:45 +08:00 |
|
gaowdong
|
e774797e59
|
Merge remote-tracking branch 'origin/master'
|
2025-05-26 17:14:21 +08:00 |
|
gaowdong
|
0f01e02acf
|
账户管理
|
2025-05-26 17:14:15 +08:00 |
|
sxu
|
de18455d0c
|
商品单位-仓库管理
|
2025-05-26 17:12:13 +08:00 |
|
sxu
|
336de40460
|
商品单位-仓库管理
|
2025-05-26 17:02:22 +08:00 |
|
sxu
|
054c21e9c1
|
菜谱-新增
|
2025-05-26 16:21:49 +08:00 |
|
sxu
|
cc0ffa7597
|
Merge remote-tracking branch 'origin/master'
|
2025-05-26 16:07:30 +08:00 |
|
sxu
|
f9dd9148ac
|
基础参数
|
2025-05-26 16:07:20 +08:00 |
|
gaowdong
|
105d57c96c
|
账户管理
|
2025-05-26 15:50:41 +08:00 |
|
sxu
|
72b91c1cc1
|
商品类型管理
|
2025-05-26 14:42:18 +08:00 |
|
sxu
|
364443bc20
|
基础设置
|
2025-05-26 14:04:21 +08:00 |
|
sxu
|
de1f3276a7
|
基础设置
|
2025-05-26 13:57:33 +08:00 |
|
sxu
|
817dc632a0
|
基础设置
|
2025-05-26 13:41:11 +08:00 |
|
sxu
|
296da9940d
|
轮播图
|
2025-05-26 13:31:40 +08:00 |
|
sxu
|
c319018768
|
新增菜谱
|
2025-05-26 07:56:35 +08:00 |
|
sxu
|
2a74f41713
|
新增菜谱
|
2025-05-26 07:53:32 +08:00 |
|
sxu
|
e2e0d6f41e
|
用户地址
|
2025-05-26 07:28:45 +08:00 |
|
sxu
|
1b71457b82
|
basic stall
|
2025-05-25 21:59:15 +08:00 |
|
sxu
|
d18e70e100
|
basic stall
|
2025-05-25 21:43:27 +08:00 |
|
sxu
|
c8964c9f73
|
basic stall
|
2025-05-25 21:35:44 +08:00 |
|
sxu
|
c71d676532
|
basic canteen
|
2025-05-25 21:14:57 +08:00 |
|
sxu
|
57351213c5
|
basic canteen
|
2025-05-25 20:59:47 +08:00 |
|
sxu
|
8e55d9158c
|
basic area
|
2025-05-25 20:21:49 +08:00 |
|
sxu
|
183989d1ac
|
init
|
2025-05-25 20:00:31 +08:00 |
|
sxu
|
947233f79a
|
init
|
2025-05-25 19:57:10 +08:00 |
|
sxu
|
2072f5990a
|
first commit
|
2025-05-25 12:12:02 +08:00 |