Commit Graph

344 Commits

Author SHA1 Message Date
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