From 2d68849658d01e788a25c74995e40c64fd77dbd0 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Mon, 10 Aug 2026 16:10:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=8E=A2=E5=AD=97=E6=AE=B5=E8=A1=A5?=
 =?UTF-8?q?=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/entity/BoxesBookingEntity.java    | 43 +++++++++++++++++++
 .../resources/mapper/BoxesBookingMapper.xml   |  6 +--
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java
index e75a02ba..3e6af80b 100644
--- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java
+++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java
@@ -33,6 +33,18 @@ public class BoxesBookingEntity extends Model<BoxesBookingEntity> {
     @Schema(description="餐桌Id")
     private Long boxesId;
 
+	/**
+	* 开始时间
+	*/
+	@Schema(description="开始时间")
+	private LocalDateTime startTime;
+
+	/**
+	* 结束时间
+	*/
+	@Schema(description="结束时间")
+	private LocalDateTime endTime;
+
 	/**
 	* 预约日期
 	*/
@@ -75,6 +87,30 @@ public class BoxesBookingEntity extends Model<BoxesBookingEntity> {
     @Schema(description="备注信息")
     private String remark;
 
+	/**
+	* 审核人id
+	*/
+	@Schema(description="审核人id")
+	private Long checkUserId;
+
+	/**
+	* 审核状态 1审核中 2通过 3驳回
+	*/
+	@Schema(description="审核状态")
+	private String checkStatus;
+
+	/**
+	* 流程实例id
+	*/
+	@Schema(description="流程实例id")
+	private String processInstanceId;
+
+	/**
+	* 审核意见
+	*/
+	@Schema(description="审核意见")
+	private String checkReason;
+
 	/**
 	* 创建人
 	*/
@@ -89,6 +125,13 @@ public class BoxesBookingEntity extends Model<BoxesBookingEntity> {
     @Schema(description="创建时间")
     private LocalDateTime createTime;
 
+	/**
+	* 更新人
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	@Schema(description="更新人")
+	private String updateBy;
+
 	/**
 	* 更新时间
 	*/
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/BoxesBookingMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/BoxesBookingMapper.xml
index 8bbfd20e..737c571e 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/BoxesBookingMapper.xml
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/BoxesBookingMapper.xml
@@ -10,17 +10,15 @@
         <result property="endTime" column="end_time"/>
         <result property="checkUserId" column="check_user_id"/>
         <result property="checkStatus" column="check_status"/>
-        <result property="creator" column="creator"/>
-        <result property="updater" column="updater"/>
-        <result property="deleted" column="deleted"/>
         <result property="bookingDate" column="booking_date"/>
         <result property="userId" column="user_id"/>
         <result property="status" column="status"/>
         <result property="totalPrice" column="total_price"/>
+        <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="deptId" column="dept_id"/>
-        <result property="createBy" column="create_by"/>
         <result property="processInstanceId" column="process_instance_id"/>
         <result property="checkReason" column="check_reason"/>
   </resultMap>