Commit Graph

339 Commits

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