Commit Graph

717 Commits

Author SHA1 Message Date
sxu 75e41f9018 Merge remote-tracking branch 'origin/master' 2025-07-07 17:16:58 +08:00
skjia 67be09636c jsk 门禁设备加载 2025-07-07 17:06:53 +08:00
sxu c34fbeaf98 i国网:一周菜谱接入 2025-07-07 17:04:16 +08:00
sxu 6074f8f2fd 还原主程序 2025-07-07 16:51:09 +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 ea1649d981 智能出入库秤 2025-07-07 13:45:28 +08:00
sxu 7a6de485a3 AI_ELECTRONIC_SCALE(66, "AI电子秤") 2025-07-07 13:37:26 +08:00
sxu a958533ec6 zhhq 2025-07-07 13:34:11 +08:00
sxu 91c998c8e6 领料单退料单 2025-07-07 13:20:59 +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 e32d43897f Merge remote-tracking branch 'origin/master' 2025-07-07 12:56:25 +08:00
liux 65ac48eda9 厨房首页 设备问题修复 2025-07-07 09:22:17 +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
jjLv a9d07ce5e7 数据总览数据 2025-07-04 16:56:27 +08:00
sxu 111dcfa568 i国网-一周菜谱 2025-07-04 16:33:38 +08:00
sxu 496d8761cc Merge remote-tracking branch 'origin/master' 2025-07-04 15:37:41 +08:00
sxu 1e78459fdf 文件更名 2025-07-04 15:35:12 +08:00
gaowdong 08e1156152 订单查询修改 2025-07-04 15:30:32 +08:00
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
sxu bd136aad44 设备类型 2025-07-04 10:59:48 +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