 sxu
|
e5776dd910
|
i国网：一周菜谱
|
2025-07-07 18:10:01 +08:00 |
|
sxu
|
54ce84f534
|
i国网：一周菜谱接入
|
2025-07-07 16:50:40 +08:00 |
|
sxu
|
684ede633c
|
i国网：一周菜谱接入
|
2025-07-07 15:23:55 +08:00 |
|
sxu
|
a958533ec6
|
zhhq
|
2025-07-07 13:34:11 +08:00 |
|
sxu
|
f8f0f4604c
|
领料单退料单
|
2025-07-07 13:18:25 +08:00 |
|
sxu
|
b41d187e7b
|
Revert "领料单退料单"
This reverts commit 3375aca6aa.
|
2025-07-07 13:12:28 +08:00 |
|
sxu
|
3375aca6aa
|
领料单退料单
|
2025-07-07 13:10:15 +08:00 |
|
sxu
|
908d743327
|
Merge remote-tracking branch 'origin/master'
|
2025-07-07 08:30:41 +08:00 |
|
sxu
|
80886a9b69
|
i国网-一周菜谱
|
2025-07-04 18:22:02 +08:00 |
skjia
|
2a4a4a97c2
|
jsk 厨房进出记录修正
|
2025-07-04 17:13:05 +08:00 |
|
sxu
|
111dcfa568
|
i国网-一周菜谱
|
2025-07-04 16:33:38 +08:00 |
gaowdong
|
4586f61c51
|
供应链修改
|
2025-07-04 14:35:38 +08:00 |
|
gaowdong
|
938fe57b06
|
Merge remote-tracking branch 'origin/master'
|
2025-07-04 13:45:09 +08:00 |
|
gaowdong
|
5bed40ca6b
|
增加排序条件
|
2025-07-04 13:44:30 +08:00 |
 jjLv
|
22fb0cbdcf
|
营养类别删除增加食材判断
数据总览数据为昨日数据（之前为上一个有食堂订单数据）
|
2025-07-04 13:40:56 +08:00 |
|
skjia
|
770c30e069
|
Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-JYY-Smart-Canteen
|
2025-07-04 10:57:43 +08:00 |
|
skjia
|
a7241e6352
|
jsk 电话加密
|
2025-07-04 10:56:25 +08:00 |
|
jjLv
|
5b64648c89
|
APP获取用户信息 去除手机号解密
设备APK上传增加deviceType
|
2025-07-04 10:33:01 +08:00 |
|
gaowdong
|
1cccac924e
|
6672 员工信息中未做手机号唯一性校验
|
2025-07-04 09:59:14 +08:00 |
|
skjia
|
14c4f53941
|
jsk ---厨房出入接口及BUg修改
|
2025-07-03 19:48:30 +08:00 |
|
gaowdong
|
a768c9df40
|
Merge remote-tracking branch 'origin/master'
|
2025-07-03 11:26:18 +08:00 |
|
gaowdong
|
05fb76231a
|
6682 报警记录中不需要展示正常数据
|
2025-07-03 11:25:56 +08:00 |
|
sxu
|
5c975cd755
|
Merge remote-tracking branch 'origin/master'
|
2025-07-03 11:23:27 +08:00 |
|
sxu
|
ca6db30a52
|
bug-6674-改食堂区域时同时改档口区域
|
2025-07-03 11:22:52 +08:00 |
|
gaowdong
|
8764dae833
|
6651 账户消费明细中缺少消费档口字段
|
2025-07-03 09:14:08 +08:00 |
|
sxu
|
ecf928e871
|
删除订单评价中空菜谱的记录
|
2025-07-02 15:53:37 +08:00 |
|
sxu
|
3d3b00db9a
|
删除订单评价中空菜谱的记录
|
2025-07-02 15:24:26 +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
|
00dc8051f3
|
供应链-采购管理
|
2025-07-02 10:37:48 +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
|
de396f3da4
|
供应链-采购管理
|
2025-07-01 17:09:59 +08:00 |
|
gaowdong
|
36fc2bdd15
|
供应链-采购管理
|
2025-07-01 16:27:45 +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
|
c486fad5e8
|
Merge remote-tracking branch 'origin/master'
|
2025-06-30 18:11:59 +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
|
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
|
23fe423980
|
供应链
|
2025-06-30 09:23:02 +08:00 |
|
sxu
|
abd85c1487
|
供应链
|
2025-06-30 09:14:45 +08:00 |
|
sxu
|
d24dbaeb78
|
改包名
|
2025-06-30 09:09:51 +08:00 |
|
liux
|
806260b76b
|
厨房问题修复，视频列表接口编写
|
2025-06-27 17:11:15 +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
|
aa66bfdb39
|
智慧厨房
|
2025-06-26 17:25:42 +08:00 |
|
liux
|
3366e42154
|
首页接口
|
2025-06-25 16:09:16 +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
|
4798d2b3a3
|
Merge remote-tracking branch 'origin/master'
|
2025-06-25 11:14:57 +08:00 |
|
gaowdong
|
cf67aeaabf
|
智慧厨房
|
2025-06-25 11:04:46 +08:00 |
|
sxu
|
7afa5bacb9
|
卡号不应重复发放
|
2025-06-25 10:10:20 +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
|
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
|
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 |