 sxu
|
dc64b1b099
|
位置信息优化
|
2025-06-23 17:27:39 +08:00 |
 jjLv
|
cf0d0035c9
|
Merge remote-tracking branch 'origin/master'
|
2025-06-23 17:27:38 +08:00 |
|
jjLv
|
0562fbb942
|
0623bug修改
|
2025-06-23 17:26:49 +08:00 |
gaowdong
|
de96c9a9c8
|
Merge remote-tracking branch 'origin/master'
|
2025-06-23 16:39:11 +08:00 |
|
gaowdong
|
87bc3002ab
|
订单菜品限购
|
2025-06-23 16:38:02 +08:00 |
|
sxu
|
87def2c183
|
Merge remote-tracking branch 'origin/master'
|
2025-06-23 16:24:38 +08:00 |
|
sxu
|
3ed3e3c57c
|
位置信息优化
|
2025-06-23 16:24:13 +08:00 |
|
gaowdong
|
92b72c1e5d
|
Merge remote-tracking branch 'origin/master'
|
2025-06-23 14:40:16 +08:00 |
|
gaowdong
|
39fd6ff85e
|
智慧厨房
|
2025-06-23 14:40:02 +08:00 |
|
sxu
|
cb81116691
|
位置信息和员工进出信息
|
2025-06-23 13:29:28 +08:00 |
 liux
|
df66e88ace
|
首页统计数据
|
2025-06-20 18:06:21 +08:00 |
|
gaowdong
|
7b37799469
|
智慧厨房
|
2025-06-20 16:38:38 +08:00 |
|
gaowdong
|
bd703a2450
|
智慧厨房
|
2025-06-20 16:09:28 +08:00 |
|
gaowdong
|
38057e96a0
|
智慧厨房
|
2025-06-20 10:02:04 +08:00 |
|
sxu
|
d290b2d72b
|
厨房摄像头设置
|
2025-06-19 18:35:09 +08:00 |
|
sxu
|
03c36f2d0e
|
Merge remote-tracking branch 'origin/master'
|
2025-06-19 18:15:35 +08:00 |
|
sxu
|
b94b21b26e
|
厨房设置
|
2025-06-19 18:14:52 +08:00 |
|
gaowdong
|
089b201732
|
智慧厨房
|
2025-06-19 18:08:54 +08:00 |
|
sxu
|
890357723c
|
单位仓库
|
2025-06-19 17:29:41 +08:00 |
|
sxu
|
0234ca086f
|
单位仓库
|
2025-06-19 17:17:24 +08:00 |
|
sxu
|
5e7e3490ef
|
单位仓库
|
2025-06-19 17:02:07 +08:00 |
|
jjLv
|
bb9e06a9d7
|
双屏机--设备信息获取根据deviceType分类获取
|
2025-06-19 16:09:02 +08:00 |
|
gaowdong
|
c4f244d66d
|
智慧厨房
|
2025-06-19 14:50:04 +08:00 |
|
gaowdong
|
b66535be3b
|
智慧厨房
|
2025-06-19 14:38:17 +08:00 |
|
liux
|
76de2ba7fd
|
厨房设备前后台对接问题处理
|
2025-06-19 14:08:49 +08:00 |
|
gaowdong
|
b2b764840e
|
Merge remote-tracking branch 'origin/master'
|
2025-06-19 11:18:03 +08:00 |
|
gaowdong
|
f410994c76
|
智慧厨房
|
2025-06-19 11:16:27 +08:00 |
|
liux
|
3d929972d9
|
设备类型、查询设备下拉框和设备类型接口
|
2025-06-19 11:06:43 +08:00 |
|
sxu
|
589e1ef4d7
|
Merge remote-tracking branch 'origin/master'
|
2025-06-18 20:48:25 +08:00 |
|
gaowdong
|
e67266f3af
|
智慧厨房
|
2025-06-18 17:41:22 +08:00 |
|
sxu
|
2e8e200963
|
设备传感器指标最大最小值设置
|
2025-06-18 17:06:02 +08:00 |
|
liux
|
e7d25adeb8
|
设备信息、设备使用记录模块
|
2025-06-18 17:03:09 +08:00 |
|
gaowdong
|
cb87db880b
|
智慧厨房
|
2025-06-18 16:57:34 +08:00 |
|
gaowdong
|
ec19fd427d
|
Merge remote-tracking branch 'origin/master'
|
2025-06-18 16:53:21 +08:00 |
|
gaowdong
|
8b25826a8c
|
智慧厨房
|
2025-06-18 16:53:03 +08:00 |
|
sxu
|
82b3bf8fea
|
设备传感器指标最大最小值设置
|
2025-06-18 16:51:24 +08:00 |
|
sxu
|
36dafaab46
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenDeviceSensorMetricMapper.xml
|
2025-06-18 16:39:15 +08:00 |
|
sxu
|
4de4bfe8ac
|
设备传感器指标最大最小值设置
|
2025-06-18 16:36:58 +08:00 |
|
gaowdong
|
edd2a6053d
|
智慧厨房
|
2025-06-18 16:14:51 +08:00 |
|
gaowdong
|
285c18aa05
|
智慧厨房
|
2025-06-18 15:49:00 +08:00 |
|
jjLv
|
b00a9f2ac6
|
双屏机--修改人脸查询和人员信息查询
|
2025-06-17 14:31:04 +08:00 |
|
jjLv
|
734301c714
|
0616bug修改
|
2025-06-17 13:50:18 +08:00 |
|
sxu
|
0d72b09f48
|
订单评价添加档口名称
|
2025-06-17 13:48:09 +08:00 |
|
sxu
|
05dc6fa2ce
|
fix bug 6334
|
2025-06-17 13:13:41 +08:00 |
|
sxu
|
64ced85c17
|
fix bug 6354
|
2025-06-17 11:03:54 +08:00 |
|
sxu
|
0abf79e44b
|
编辑菜谱丢失菜品销量问题修复
|
2025-06-17 10:47:18 +08:00 |
|
sxu
|
da5b94380f
|
厨房员工设备权限
|
2025-06-17 10:31:16 +08:00 |
|
gaowdong
|
b17b0424ed
|
Merge remote-tracking branch 'origin/master'
|
2025-06-16 18:42:28 +08:00 |
|
gaowdong
|
3f9f58ae1f
|
订单限购
|
2025-06-16 18:42:06 +08:00 |
|
sxu
|
ee5f4fd914
|
智慧厨房
|
2025-06-16 18:40:41 +08:00 |
|
sxu
|
c92039ca6b
|
bug 6362
|
2025-06-16 18:22:15 +08:00 |
|
sxu
|
04db38c4c8
|
bug 6336
|
2025-06-16 17:56:44 +08:00 |
|
sxu
|
1d1119c5de
|
bug 6345
|
2025-06-16 16:57:14 +08:00 |
|
sxu
|
c87b610bb9
|
设置的批量修改和恢复
|
2025-06-16 11:25:32 +08:00 |
|
jjLv
|
e5bb96d186
|
菜品校验查询类别默认不查parent=0的值
|
2025-06-13 16:56:39 +08:00 |
skjia
|
aec860dacf
|
jsk BUG修正
|
2025-06-13 15:06:57 +08:00 |
|
skjia
|
57cb2301b7
|
jsk BUG问题修正
|
2025-06-13 13:26:35 +08:00 |
|
gaowdong
|
a6afd8b397
|
钱包操作记录查询增加字段
|
2025-06-12 15:57:26 +08:00 |
|
gaowdong
|
eb01a2a6cb
|
Merge remote-tracking branch 'origin/master'
|
2025-06-12 15:26:33 +08:00 |
|
gaowdong
|
b1c2310c16
|
钱包操作记录查询增加字段
|
2025-06-12 15:26:05 +08:00 |
|
jjLv
|
4c78b3d5d9
|
营养信息添加字段
|
2025-06-12 15:24:23 +08:00 |
|
jjLv
|
e6c6757693
|
营养信息添加字段
|
2025-06-12 14:45:27 +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
|
f073dbfee7
|
fix bug 6239
|
2025-06-10 21:10:07 +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
|
ff2384bf6f
|
订单备注
|
2025-06-10 17:26:20 +08:00 |
|
gaowdong
|
753c74d8a6
|
6243 批量补贴和批量清空补贴时人员的所属组织不回显
|
2025-06-10 16:59:07 +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
|
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 |
|
sxu
|
705d15794c
|
h5周菜谱
|
2025-06-08 12:21:19 +08:00 |
|
sxu
|
558646d274
|
h5周菜谱
|
2025-06-08 09:34:02 +08:00 |
|
sxu
|
0005d5861f
|
h5周菜谱
|
2025-06-07 13:52:06 +08:00 |
|
sxu
|
90016a24fa
|
Merge branch 'master' into test0606
|
2025-06-07 10:20:59 +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
|
e6c0c78513
|
h5周菜谱
|
2025-06-06 17:06:12 +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 |
|
sxu
|
22414dc431
|
订单评价列表
|
2025-06-06 09:39:28 +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
|
5df68400a8
|
订单菜谱评价
|
2025-06-05 16:20:42 +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
|
f563492a17
|
Merge remote-tracking branch 'origin/master'
|
2025-06-05 13:46: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 |
|
skjia
|
72088fc2ca
|
jsk 健康
|
2025-06-05 11:28:58 +08:00 |
|
sxu
|
c89cb30e93
|
菜谱导入
|
2025-06-05 10:50:34 +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 |
|
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
|
6c9aa332d6
|
删除cook_dishes_base
|
2025-06-04 10:17:31 +08:00 |
|
sxu
|
affb765dcf
|
当前菜谱
|
2025-06-03 16:39:09 +08:00 |
|
gaowdong
|
efeb4be4c2
|
订单管理
|
2025-06-03 14:54:33 +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
|
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 |
|
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 |