 jjLv
|
e6c6757693
|
营养信息添加字段
|
2025-06-12 14:45:27 +08:00 |
gaowdong
|
7ade0be51f
|
设备订单状态下单后改为已完成（需求来自shengxu）
|
2025-06-12 10:39:37 +08:00 |
|
gaowdong
|
20dd2005d3
|
订单增加配送方式参数
|
2025-06-11 16:06:55 +08:00 |
|
gaowdong
|
329fe7ff35
|
6264 用户下单时间和退款时间一样，但实际操作时，下单是一个时间，退款是另一个时间
|
2025-06-11 14:41:17 +08:00 |
|
gaowdong
|
65d1ebf741
|
6245 账户退卡后账户管理中依然显示已退卡号，且重新发卡后会多出一条新卡号数据
|
2025-06-11 14:07:58 +08:00 |
 sxu
|
5888a21f1a
|
bug 6276
|
2025-06-11 12:14:36 +08:00 |
|
sxu
|
eee8828ae2
|
h5菜谱显示不全的问题
|
2025-06-11 12:01:44 +08:00 |
|
sxu
|
9f88c9f7ff
|
Merge remote-tracking branch 'origin/master'
|
2025-06-11 11:18:01 +08:00 |
|
sxu
|
50a9a56452
|
bug 6273
|
2025-06-11 11:15:54 +08:00 |
|
gaowdong
|
4af9fe0bdc
|
6288 交易流水充值后消费，账户余额显示不对
|
2025-06-11 09:27:40 +08:00 |
|
sxu
|
a466bab26d
|
有商品不能删除超市
|
2025-06-11 09:19:29 +08:00 |
|
sxu
|
f073dbfee7
|
fix bug 6239
|
2025-06-10 21:10:07 +08:00 |
|
sxu
|
b681da09bf
|
fix bug 6236
|
2025-06-10 20:59:17 +08:00 |
|
sxu
|
c870cd87bc
|
fix bug 6234
|
2025-06-10 20:09:41 +08:00 |
|
sxu
|
aa035e3208
|
fix bug 6233
|
2025-06-10 20:00:54 +08:00 |
|
jjLv
|
b71047cc11
|
营养信息添加食材编码校验
|
2025-06-10 18:24:10 +08:00 |
|
gaowdong
|
60435f52a2
|
6241 钱包管理提现时提现金额输入过大时系统提示不友好建议优化
|
2025-06-10 18:07:40 +08:00 |
|
gaowdong
|
ff2384bf6f
|
订单备注
|
2025-06-10 17:26:20 +08:00 |
|
gaowdong
|
753c74d8a6
|
6243 批量补贴和批量清空补贴时人员的所属组织不回显
|
2025-06-10 16:59:07 +08:00 |
|
gaowdong
|
e32a7d6cfb
|
订单管理-退单
|
2025-06-10 14:39:38 +08:00 |
|
gaowdong
|
3965503f89
|
订单管理-退单
|
2025-06-10 14:00:44 +08:00 |
|
gaowdong
|
c30fe148de
|
订单管理-退单
|
2025-06-09 17:21:52 +08:00 |
skjia
|
d4357b9949
|
jsk
|
2025-06-09 15:57:19 +08:00 |
|
sxu
|
3fe1cb6e88
|
删除多余代码
|
2025-06-09 14:45:21 +08:00 |
|
sxu
|
5020e2fd50
|
Merge remote-tracking branch 'origin/master'
|
2025-06-09 13:52:11 +08:00 |
|
sxu
|
df3cc9e90c
|
recipe detail id
|
2025-06-09 13:51:44 +08:00 |
|
skjia
|
874814822f
|
Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-JYY-Smart-Canteen
|
2025-06-09 13:27:19 +08:00 |
|
skjia
|
c8b0e17366
|
jsk
|
2025-06-09 13:26:56 +08:00 |
|
gaowdong
|
02d617667c
|
Merge branch 'master' into report
|
2025-06-09 10:15:42 +08:00 |
|
gaowdong
|
05c0d92af7
|
报表管理
|
2025-06-09 09:53:12 +08:00 |
|
skjia
|
a82e3df139
|
jsk
|
2025-06-09 09:43:16 +08:00 |
|
gaowdong
|
eac723ed1b
|
Merge branch 'master' into report
|
2025-06-09 09:24:56 +08:00 |
|
gaowdong
|
07aa601801
|
报表管理
|
2025-06-09 09:23:22 +08:00 |
|
skjia
|
c7bec95298
|
jsk 商超
|
2025-06-09 08:53:57 +08:00 |
|
skjia
|
d663ed2521
|
jsk 商超
|
2025-06-09 08:50:46 +08:00 |
|
sxu
|
81f11e3800
|
添加保护
|
2025-06-09 06:39:54 +08:00 |
|
sxu
|
85ddb86e6a
|
删除无用vo
|
2025-06-08 12:56:11 +08:00 |
|
sxu
|
22b5870fcb
|
h5周菜谱
|
2025-06-08 12:39:47 +08:00 |
|
sxu
|
33b2a4aebc
|
h5周菜谱
|
2025-06-08 12:34:33 +08:00 |
|
sxu
|
0ee7b3ee27
|
h5周菜谱
|
2025-06-08 12:32:09 +08:00 |
|
sxu
|
705d15794c
|
h5周菜谱
|
2025-06-08 12:21:19 +08:00 |
|
sxu
|
83c20f2bc4
|
h5周菜谱
|
2025-06-08 10:59:40 +08:00 |
|
sxu
|
558646d274
|
h5周菜谱
|
2025-06-08 09:34:02 +08:00 |
|
sxu
|
150c494d37
|
h5周菜谱
|
2025-06-08 09:13:49 +08:00 |
|
sxu
|
567b902073
|
h5周菜谱
|
2025-06-08 09:09:55 +08:00 |
|
sxu
|
0f9b5a20f0
|
h5周菜谱
|
2025-06-08 09:06:08 +08:00 |
|
sxu
|
0005d5861f
|
h5周菜谱
|
2025-06-07 13:52:06 +08:00 |
|
sxu
|
c2dea1ccb2
|
h5周菜谱
|
2025-06-07 10:26:03 +08:00 |
|
sxu
|
90016a24fa
|
Merge branch 'master' into test0606
|
2025-06-07 10:20:59 +08:00 |
|
sxu
|
92a6f455b8
|
h5周菜谱
|
2025-06-07 10:18:28 +08:00 |
|
sxu
|
05c03159ac
|
h5周菜谱
|
2025-06-07 10:16:06 +08:00 |
|
sxu
|
0e64334328
|
h5周菜谱
|
2025-06-07 10:09:07 +08:00 |
|
sxu
|
0e5cab6adf
|
h5周菜谱
|
2025-06-07 09:47:31 +08:00 |
|
sxu
|
e42bcb884b
|
h5周菜谱
|
2025-06-07 09:17:53 +08:00 |
|
sxu
|
b23e27759b
|
h5周菜谱
|
2025-06-06 17:50:37 +08:00 |
|
sxu
|
e277c176e8
|
h5周菜谱
|
2025-06-06 17:23:16 +08:00 |
|
sxu
|
e6c0c78513
|
h5周菜谱
|
2025-06-06 17:06:12 +08:00 |
|
gaowdong
|
317caccc5b
|
订单管理
|
2025-06-06 17:04:30 +08:00 |
|
sxu
|
3144a21a8d
|
h5周菜谱
|
2025-06-06 15:48:14 +08:00 |
|
skjia
|
da0defe6a0
|
jsk 交易流水
|
2025-06-06 15:39:33 +08:00 |
|
sxu
|
f24d7330ea
|
h5预订餐
|
2025-06-06 15:28:41 +08:00 |
|
sxu
|
434fbedda2
|
h5预订餐
|
2025-06-06 15:11:09 +08:00 |
|
sxu
|
a3fe487e36
|
h5预订餐
|
2025-06-06 14:52:57 +08:00 |
|
jjLv
|
411e376d79
|
降低双屏机菜谱获取数据复杂度
|
2025-06-06 13:52:51 +08:00 |
|
jjLv
|
19ec96e0dc
|
数据总览 - 食堂（超市）订单及销量趋势加入weekDay
|
2025-06-06 10:54:12 +08:00 |
|
sxu
|
db925f3fc1
|
Merge remote-tracking branch 'origin/master'
|
2025-06-06 10:17:57 +08:00 |
|
sxu
|
f3673a8f2d
|
餐次排序
|
2025-06-06 10:17:08 +08:00 |
|
gaowdong
|
8ecc17b6cc
|
订单管理
|
2025-06-06 10:15:47 +08:00 |
|
sxu
|
22414dc431
|
订单评价列表
|
2025-06-06 09:39:28 +08:00 |
|
sxu
|
ecd8345682
|
订单评价列表
|
2025-06-06 09:32:57 +08:00 |
|
sxu
|
cbe0db51ec
|
订单评价列表
|
2025-06-06 09:25:09 +08:00 |
|
skjia
|
3dda3ec2ee
|
jsk 体检
|
2025-06-06 08:57:26 +08:00 |
|
sxu
|
a745172a60
|
商品上架
|
2025-06-05 17:14:04 +08:00 |
|
sxu
|
49c1d2b427
|
菜谱收藏
|
2025-06-05 16:57:51 +08:00 |
|
sxu
|
5e18ff152c
|
Merge remote-tracking branch 'origin/master'
|
2025-06-05 16:21:29 +08:00 |
|
sxu
|
5df68400a8
|
订单菜谱评价
|
2025-06-05 16:20:42 +08:00 |
|
gaowdong
|
1ef6f03622
|
订单管理
|
2025-06-05 15:25:39 +08:00 |
|
sxu
|
85768439b0
|
商品上架
|
2025-06-05 15:13:59 +08:00 |
|
jjLv
|
11b71392f6
|
双屏机查询人脸、人员信息条件优化
|
2025-06-05 15:01:11 +08:00 |
|
sxu
|
b3cd13d4a4
|
订单评价
|
2025-06-05 14:55:22 +08:00 |
|
sxu
|
ca27ff0d65
|
Merge remote-tracking branch 'origin/master'
|
2025-06-05 14:53:48 +08:00 |
|
sxu
|
e9b9c8ff4f
|
订单评价
|
2025-06-05 14:50:04 +08:00 |
|
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 |