 sxu
|
4798d2b3a3
|
Merge remote-tracking branch 'origin/master'
|
2025-06-25 11:14:57 +08:00 |
|
sxu
|
a25c74a19b
|
取消Long型返回String
|
2025-06-25 11:14:30 +08:00 |
gaowdong
|
cf67aeaabf
|
智慧厨房
|
2025-06-25 11:04:46 +08:00 |
|
sxu
|
7afa5bacb9
|
卡号不应重复发放
|
2025-06-25 10:10:20 +08:00 |
|
sxu
|
5fd28c60c8
|
菜谱编辑优化
|
2025-06-25 09:55:23 +08:00 |
 liux
|
4169cf7d3a
|
数据库表更改，设备相关接口、系统首页统计接口修改
|
2025-06-24 16:15:25 +08:00 |
|
gaowdong
|
981bbdbe6d
|
报表增加 部分退单状态
|
2025-06-24 13:35:32 +08:00 |
|
gaowdong
|
965c082f59
|
Merge remote-tracking branch 'origin/master'
|
2025-06-23 17:54:45 +08:00 |
|
gaowdong
|
6dc82e7a89
|
智慧厨房
|
2025-06-23 17:54:14 +08:00 |
|
sxu
|
cc18c9f36e
|
菜谱编辑优化
|
2025-06-23 17:51:41 +08:00 |
|
sxu
|
eb80b04134
|
位置信息优化
|
2025-06-23 17:29:34 +08:00 |
|
sxu
|
4f7503ffec
|
Merge remote-tracking branch 'origin/master'
|
2025-06-23 17:28:32 +08:00 |
|
sxu
|
fa6332822c
|
Merge remote-tracking branch 'origin/master'
|
2025-06-23 17:27:56 +08:00 |
|
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
|
5c74391993
|
智慧厨房
|
2025-06-23 15:26:10 +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 |
|
sxu
|
2b41e57d27
|
Merge remote-tracking branch 'origin/master'
|
2025-06-23 09:29:36 +08:00 |
|
sxu
|
bc40d2d8c5
|
摄像头设置改表
|
2025-06-23 09:29:07 +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
|
57e561369b
|
智慧厨房
|
2025-06-20 10:19:37 +08:00 |
|
gaowdong
|
38057e96a0
|
智慧厨房
|
2025-06-20 10:02:04 +08:00 |
|
sxu
|
66826d8c30
|
摄像头设置改表
|
2025-06-20 09:47:55 +08:00 |
|
sxu
|
068687e02a
|
厨房设置该表
|
2025-06-20 09:26:30 +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 |
|
gaowdong
|
4bc462feb9
|
智慧厨房
|
2025-06-19 09:52:25 +08:00 |
|
gaowdong
|
9a414349a0
|
智慧厨房
|
2025-06-19 09:13:52 +08:00 |
|
gaowdong
|
2a5d92593c
|
智慧厨房
|
2025-06-19 09:08:44 +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
|
96e238d661
|
设备传感器指标最大最小值设置
|
2025-06-18 16:47:04 +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 |
|
sxu
|
7d970f687d
|
食堂档口不分页接口
|
2025-06-18 13:40:06 +08:00 |
|
sxu
|
b806721d03
|
物理卡挂失解挂
|
2025-06-17 18:17:12 +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
|
bf157090a9
|
fix bug 6334
|
2025-06-17 13:27:01 +08:00 |
|
sxu
|
e3332cce79
|
Merge remote-tracking branch 'origin/master'
|
2025-06-17 13:14:38 +08:00 |
|
sxu
|
05dc6fa2ce
|
fix bug 6334
|
2025-06-17 13:13:41 +08:00 |
|
gaowdong
|
7d43ab725b
|
部分退单可以核销
|
2025-06-17 13:09:51 +08:00 |
|
sxu
|
a6422e9aa9
|
Merge remote-tracking branch 'origin/master'
|
2025-06-17 11:05:13 +08:00 |
|
sxu
|
64ced85c17
|
fix bug 6354
|
2025-06-17 11:03:54 +08:00 |
|
gaowdong
|
ff9dbb2370
|
6367 部分退单后订单状态错误，依然为“已下单”，应该为“部分退款”
|
2025-06-17 10:52:01 +08:00 |
|
sxu
|
0abf79e44b
|
编辑菜谱丢失菜品销量问题修复
|
2025-06-17 10:47:18 +08:00 |
|
sxu
|
da5b94380f
|
厨房员工设备权限
|
2025-06-17 10:31:16 +08:00 |
|
sxu
|
68f64358e2
|
bug 6359
|
2025-06-17 09:05:45 +08:00 |
|
sxu
|
f3a17982b2
|
Merge remote-tracking branch 'origin/master'
|
2025-06-16 21:23:50 +08:00 |
|
sxu
|
bd0ed29c96
|
超市不分页接口
|
2025-06-16 21:22:40 +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
|
b0ce1ed9e4
|
bug 6338
|
2025-06-16 17:05:42 +08:00 |
|
sxu
|
1d1119c5de
|
bug 6345
|
2025-06-16 16:57:14 +08:00 |
skjia
|
fecac82f1f
|
Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-JYY-Smart-Canteen
|
2025-06-16 12:48:08 +08:00 |
|
skjia
|
01d36011f6
|
jsk
|
2025-06-16 12:47:56 +08:00 |
|
sxu
|
80dc2573a3
|
Merge remote-tracking branch 'origin/master'
|
2025-06-16 11:25:46 +08:00 |
|
sxu
|
c87b610bb9
|
设置的批量修改和恢复
|
2025-06-16 11:25:32 +08:00 |
|
skjia
|
d3bd419a3f
|
jsk 健康管理
|
2025-06-16 10:19:36 +08:00 |
|
gaowdong
|
282f9bb0f3
|
部分退单增加库存
|
2025-06-13 18:08:50 +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
|
7284465c60
|
部分退单加日志
|
2025-06-13 10:16:29 +08:00 |
|
gaowdong
|
71629f9a7f
|
退单提醒优化
|
2025-06-13 09:38:40 +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 |
|
gaowdong
|
0c0be94e1e
|
Merge remote-tracking branch 'origin/master'
|
2025-06-12 14:48:14 +08:00 |
|
gaowdong
|
e3450235b2
|
钱包操作记录查询支付成功的
|
2025-06-12 14:47:59 +08:00 |
|
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 |