gaowdong
|
d14ccd5773
|
Merge remote-tracking branch 'origin/master'
|
2025-07-04 14:35:52 +08:00 |
|
gaowdong
|
4586f61c51
|
供应链修改
|
2025-07-04 14:35:38 +08:00 |
 sxu
|
8607fda249
|
Merge remote-tracking branch 'origin/master'
|
2025-07-04 13:59:44 +08:00 |
|
sxu
|
8f2c2adfc9
|
转换价格金额元->分
|
2025-07-04 13:59:09 +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 |
|
sxu
|
4fe5bf5c20
|
Merge remote-tracking branch 'origin/master'
|
2025-07-04 13:44:25 +08:00 |
|
sxu
|
7afc1fbad0
|
转换价格金额元->分
|
2025-07-04 13:43:16 +08:00 |
 jjLv
|
22fb0cbdcf
|
营养类别删除增加食材判断
数据总览数据为昨日数据（之前为上一个有食堂订单数据）
|
2025-07-04 13:40:56 +08:00 |
|
sxu
|
d07a6d1072
|
前后餐次时间不能重叠
|
2025-07-04 11:19:34 +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
|
602c04b0f6
|
Merge remote-tracking branch 'origin/master'
|
2025-07-04 10:33:24 +08:00 |
|
jjLv
|
5b64648c89
|
APP获取用户信息 去除手机号解密
设备APK上传增加deviceType
|
2025-07-04 10:33:01 +08:00 |
|
gaowdong
|
c16da18514
|
Merge remote-tracking branch 'origin/master'
|
2025-07-04 10:32:15 +08:00 |
|
gaowdong
|
0cda82e13c
|
餐厨废弃物图片处理
|
2025-07-04 10:31:54 +08:00 |
|
skjia
|
c426c1dc8d
|
Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-JYY-Smart-Canteen
|
2025-07-04 10:23:32 +08:00 |
|
skjia
|
b3b6b1ce0c
|
jsk 门禁不初始化
|
2025-07-04 10:23:19 +08:00 |
|
gaowdong
|
1cccac924e
|
6672 员工信息中未做手机号唯一性校验
|
2025-07-04 09:59:14 +08:00 |
|
skjia
|
717fd7441b
|
JSK pom.xml
|
2025-07-04 09:42:03 +08:00 |
|
gaowdong
|
b313e34260
|
Merge remote-tracking branch 'origin/master'
|
2025-07-04 09:13:37 +08:00 |
|
gaowdong
|
c0fccb61f1
|
6673 员工信息修改页面中出入权限设备位置回显错误
|
2025-07-04 09:13:23 +08:00 |
|
skjia
|
14c4f53941
|
jsk ---厨房出入接口及BUg修改
|
2025-07-03 19:48:30 +08:00 |
 liux
|
a415d405fc
|
设备相关bug修复
|
2025-07-03 13:53:56 +08:00 |
|
sxu
|
2e8aae096e
|
抓拍频率最小值保护
|
2025-07-03 13:32:41 +08:00 |
|
sxu
|
5ba2bc90c7
|
Merge remote-tracking branch 'origin/master'
|
2025-07-03 13:01:04 +08:00 |
|
sxu
|
18636f3260
|
放开人脸录入接口
|
2025-07-03 13:00:41 +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
|
ca1d10ff92
|
6618 订单管理模块中手机号传输未加密
6620 账户管理模块用户手机号传输未加密
6622 钱包管理模块用户手机号传输未加密
|
2025-07-03 11:12:43 +08:00 |
|
gaowdong
|
f74b79ed8b
|
Merge remote-tracking branch 'origin/master'
|
2025-07-03 09:15:29 +08:00 |
|
gaowdong
|
8764dae833
|
6651 账户消费明细中缺少消费档口字段
|
2025-07-03 09:14:08 +08:00 |
|
sxu
|
b979ccbc97
|
Revert "bug-6628-接口返回手机号加密"
This reverts commit 9d43f1f833.
|
2025-07-03 08:57:55 +08:00 |
|
sxu
|
4c111087e8
|
Revert "bug-6628-接口返回手机号加密"
This reverts commit 0e2c2d8df8.
|
2025-07-03 08:57:46 +08:00 |
|
sxu
|
0e2c2d8df8
|
bug-6628-接口返回手机号加密
|
2025-07-02 18:28:24 +08:00 |
|
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 |