 sxu
|
9d43f1f833
|
bug-6628-接口返回手机号加密
|
2025-07-02 18:19:36 +08:00 |
|
sxu
|
ecf928e871
|
删除订单评价中空菜谱的记录
|
2025-07-02 15:53:37 +08:00 |
|
sxu
|
3d3b00db9a
|
删除订单评价中空菜谱的记录
|
2025-07-02 15:24:26 +08:00 |
|
sxu
|
4c7f439d65
|
Merge remote-tracking branch 'origin/master'
|
2025-07-02 14:17:54 +08:00 |
|
sxu
|
e4926b4bc6
|
餐次之菜品留样标记
|
2025-07-02 14:16:58 +08:00 |
gaowdong
|
26f42b4308
|
供应链-采购管理
|
2025-07-02 13:32:02 +08:00 |
|
gaowdong
|
1091419d25
|
供应链-采购管理
|
2025-07-02 11:28:22 +08:00 |
|
sxu
|
0fa7da306a
|
Merge remote-tracking branch 'origin/master'
|
2025-07-02 11:23:03 +08:00 |
|
sxu
|
0c0c30683d
|
注释超市商品接口
|
2025-07-02 11:22:08 +08:00 |
|
sxu
|
e58f0e0256
|
查询当前档口餐次的所有菜品及其留样特征
|
2025-07-02 10:49:24 +08:00 |
|
gaowdong
|
3c6c146d67
|
Merge remote-tracking branch 'origin/master'
|
2025-07-02 10:38:00 +08:00 |
|
gaowdong
|
00dc8051f3
|
供应链-采购管理
|
2025-07-02 10:37:48 +08:00 |
|
sxu
|
b9abdcff44
|
Merge remote-tracking branch 'origin/master'
|
2025-07-02 10:18:03 +08:00 |
|
sxu
|
0fb5aa0d42
|
查询当前档口餐次的所有菜品及其留样特征
|
2025-07-02 10:17:48 +08:00 |
|
gaowdong
|
e58d6822fd
|
Merge remote-tracking branch 'origin/master'
|
2025-07-02 09:31:31 +08:00 |
|
gaowdong
|
5b2e614af3
|
供应链-采购管理
|
2025-07-02 09:30:56 +08:00 |
 liux
|
894bd4e91a
|
供应商接口对接修改及供货商统计相关接口编写
|
2025-07-01 18:21:24 +08:00 |
|
gaowdong
|
c8e3ca6f11
|
Merge remote-tracking branch 'origin/master'
|
2025-07-01 18:01:45 +08:00 |
|
gaowdong
|
a0a592fbae
|
供应链-采购管理
|
2025-07-01 18:01:32 +08:00 |
|
sxu
|
94741f61af
|
Merge remote-tracking branch 'origin/master'
|
2025-07-01 17:38:02 +08:00 |
|
sxu
|
39f646310d
|
查询当前档口餐次的所有菜品及其留样特征
|
2025-07-01 17:33:36 +08:00 |
|
gaowdong
|
061a51a1aa
|
供应链-采购管理
|
2025-07-01 17:16:30 +08:00 |
|
gaowdong
|
de396f3da4
|
供应链-采购管理
|
2025-07-01 17:09:59 +08:00 |
|
gaowdong
|
36fc2bdd15
|
供应链-采购管理
|
2025-07-01 16:27:45 +08:00 |
|
liux
|
dcac34bf88
|
Merge remote-tracking branch 'origin/master'
|
2025-07-01 15:39:41 +08:00 |
|
liux
|
62dae04182
|
供应商分页
|
2025-07-01 15:39:17 +08:00 |
|
sxu
|
6f050ec0f9
|
Merge remote-tracking branch 'origin/master'
|
2025-07-01 15:21:40 +08:00 |
|
sxu
|
41990c1468
|
请选择营养信息名称
|
2025-07-01 15:19:08 +08:00 |
|
liux
|
bdb8de04db
|
供应商列表等功能修改，供应商资质预警列表接口
|
2025-07-01 15:07:12 +08:00 |
|
sxu
|
3692aa3024
|
食堂设备信息
|
2025-07-01 13:57:45 +08:00 |
|
sxu
|
572bc11109
|
仓库优化
|
2025-07-01 11:07:04 +08:00 |
|
sxu
|
7ba0f67f5c
|
查询仓库信息列表,不分页
|
2025-07-01 09:54:57 +08:00 |
|
sxu
|
fd5242df73
|
去掉supermarket_material表
|
2025-06-30 18:16:02 +08:00 |
|
sxu
|
d5b632268b
|
去掉supermarket_material表
|
2025-06-30 18:15:34 +08:00 |
|
sxu
|
c486fad5e8
|
Merge remote-tracking branch 'origin/master'
|
2025-06-30 18:11:59 +08:00 |
|
sxu
|
f768672f35
|
去掉supermarket_material表
|
2025-06-30 18:03:23 +08:00 |
|
sxu
|
7efee531b8
|
去掉supermarket_material表
|
2025-06-30 17:52:41 +08:00 |
|
sxu
|
26129929bb
|
去掉supermarket_material表
|
2025-06-30 17:38:46 +08:00 |
|
sxu
|
252c156d5f
|
去掉supermarket_material表
|
2025-06-30 17:37:34 +08:00 |
|
liux
|
360bd57a63
|
供应商相关代码提交
|
2025-06-30 17:35:05 +08:00 |
|
sxu
|
8081718c62
|
去掉supermarket_material表
|
2025-06-30 17:26:20 +08:00 |
|
sxu
|
f8b857ee93
|
去掉supermarket_material表
|
2025-06-30 17:00:30 +08:00 |
|
sxu
|
e2c35c5092
|
去掉supermarket_material表
|
2025-06-30 16:45:56 +08:00 |
|
sxu
|
19007047c9
|
去掉supermarket_material表
|
2025-06-30 16:23:22 +08:00 |
|
sxu
|
603537b983
|
去掉supermarket_material_type表
|
2025-06-30 16:10:15 +08:00 |
|
sxu
|
40d400107f
|
去掉supermarket_material表
|
2025-06-30 13:58:59 +08:00 |
|
sxu
|
7ab95f37b7
|
食堂后场人员登录设备密码
|
2025-06-30 10:58:30 +08:00 |
|
sxu
|
f59053f4c5
|
供应链
|
2025-06-30 09:47:03 +08:00 |
|
sxu
|
23fe423980
|
供应链
|
2025-06-30 09:23:02 +08:00 |
|
sxu
|
52a081b50b
|
供应链
|
2025-06-30 09:15:44 +08:00 |
|
sxu
|
abd85c1487
|
供应链
|
2025-06-30 09:14:45 +08:00 |
|
sxu
|
d24dbaeb78
|
改包名
|
2025-06-30 09:09:51 +08:00 |
|
liux
|
fe2b2b0883
|
新加kitsetting 首页查询修改
|
2025-06-27 17:25:43 +08:00 |
|
liux
|
806260b76b
|
厨房问题修复，视频列表接口编写
|
2025-06-27 17:11:15 +08:00 |
|
gaowdong
|
e02b958d46
|
智慧厨房-log
|
2025-06-27 16:05:26 +08:00 |
|
gaowdong
|
cfac874002
|
Merge remote-tracking branch 'origin/master'
|
2025-06-27 15:26:03 +08:00 |
|
gaowdong
|
63533ab29f
|
智慧厨房-超时自动离柜
|
2025-06-27 15:25:29 +08:00 |
|
liux
|
69cb3803fb
|
视频相关代码 jar包
|
2025-06-27 15:13:26 +08:00 |
|
liux
|
e78d475cc1
|
视频相关代码
|
2025-06-27 14:55:09 +08:00 |
skjia
|
896fa85865
|
jsk
|
2025-06-27 14:26:35 +08:00 |
|
gaowdong
|
3b00f4033c
|
智慧厨房
|
2025-06-27 10:18:48 +08:00 |
|
gaowdong
|
b3a3c0de81
|
智慧厨房
|
2025-06-26 17:31:38 +08:00 |
|
gaowdong
|
aa66bfdb39
|
智慧厨房
|
2025-06-26 17:25:42 +08:00 |
|
gaowdong
|
aeab07fa12
|
智慧厨房
|
2025-06-26 17:06:08 +08:00 |
|
liux
|
e12445da2c
|
注释部分依赖
|
2025-06-26 09:01:12 +08:00 |
|
liux
|
1e782b49d0
|
首页厨房设备字段
|
2025-06-26 08:58:01 +08:00 |
|
liux
|
3366e42154
|
首页接口
|
2025-06-25 16:09:16 +08:00 |
|
sxu
|
526b9d6d02
|
排错
|
2025-06-25 14:14:58 +08:00 |
|
sxu
|
3e4e9fe6fc
|
排错
|
2025-06-25 14:14:21 +08:00 |
|
sxu
|
2b04fce7ac
|
Merge remote-tracking branch 'origin/master'
|
2025-06-25 14:12:41 +08:00 |
|
sxu
|
db3d8380c9
|
菜谱价格防止畸变
|
2025-06-25 13:46:32 +08:00 |
|
liux
|
0da27cab4d
|
Merge remote-tracking branch 'origin/master'
|
2025-06-25 13:45:16 +08:00 |
|
liux
|
e88eb48edc
|
查询设备下卡框
|
2025-06-25 13:44:39 +08:00 |
|
skjia
|
7552b16382
|
jsk 手机查询
|
2025-06-25 13:43:51 +08:00 |
|
sxu
|
26732eaa12
|
Revert "取消Long型返回String"
This reverts commit a25c74a19b.
|
2025-06-25 11:32:48 +08:00 |
|
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 |
|
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 |
|
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 |