From 430477c7e0777531f22fc18dc8906ea75cdc21d9 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 03 十二月 2025 16:53:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCarryDept.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCarryDept.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCarryDept.java
index 4e28703..2f95e5d 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCarryDept.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/InternalAuditCarryDept.java
@@ -4,11 +4,16 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
+import java.sql.Time;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
@Data
@TableName("internal_audit_carry_dept")
@@ -28,15 +33,24 @@
private Integer deptId;
@TableField(exist = false)
+ private String deptNumber;
+
+ @TableField(exist = false)
private String deptName;
@ApiModelProperty(value = "日期")
@TableField("date")
- private String date;
+ private LocalDate date;
- @ApiModelProperty(value = "时间")
- @TableField("time")
- private String time;
+ @ApiModelProperty(value = "开始时间")
+ @TableField("start_time")
+ @JsonFormat(pattern = "HH:mm")
+ private LocalTime startTime;
+
+ @ApiModelProperty(value = "结束时间")
+ @TableField("end_time")
+ @JsonFormat(pattern = "HH:mm")
+ private LocalTime endTime;
@ApiModelProperty("审核员id")
@TableField("check_id")
--
Gitblit v1.9.2