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 { @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 { @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 { @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 @@ - - - + + -