Merge remote-tracking branch 'origin/feature/dev' into feature/dev

airport-common/src/main/java/com/sundot/airport/common/core/domain/entity/SysUser.java

@@ -373,7 +373,7 @@ public class SysUser extends BaseEntity {
     /**
      * X光机开机员开始时间
      */
-    @Excel(name = "X光机开机员开始时间")
+    @Excel(name = "X光机开机员开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date xrayMachineOperatorStartTime;
@@ -403,7 +403,7 @@ public class SysUser extends BaseEntity {
     /**
      * 免考核开始时间
      */
-    @Excel(name = "免考核开始时间")
+    @Excel(name = "免考核开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date exemptTakeAssessmentStartTime;
@@ -411,7 +411,7 @@ public class SysUser extends BaseEntity {
     /**
      * 免考核结束时间
      */
-    @Excel(name = "免考核结束时间")
+    @Excel(name = "免考核结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date exemptTakeAssessmentEndTime;