From c4f244d66d83379629910fbb28d1b4153c83dd16 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Thu, 19 Jun 2025 14:50:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E6=85=A7=E5=8E=A8=E6=88=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/core/kitchen/domain/KitchenSampleCabinetRecord.java | 2 +- .../mapper/kitchen/KitchenSampleCabinetRecordMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSampleCabinetRecord.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSampleCabinetRecord.java index b4b87a7..ba3c28d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSampleCabinetRecord.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSampleCabinetRecord.java @@ -92,7 +92,7 @@ public class KitchenSampleCabinetRecord extends BaseEntity { private String actionTypeName; @ApiModelProperty(value = "操作员工") - private Long staffName; + private String staffName; @ApiModelProperty("开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleCabinetRecordMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleCabinetRecordMapper.xml index af20944..a2527c3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleCabinetRecordMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSampleCabinetRecordMapper.xml @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select record_id, kscr.device_id, open_cabinet_temp, close_cabinet_temp, staff_id, + select record_id, kscr.device_id, open_cabinet_temp, close_cabinet_temp, kscr.staff_id, open_cabinet_time, close_cabinet_time, operate_type, action_type, operate_photo, operate_date, kscr.create_by, kscr.create_time, kscr.update_by, kscr.update_time, kdi.device_name, bc.canteen_name, su.nick_name