合并修改冲突

bootstrap/src/main/resources/application.properties

@@ -12,7 +12,7 @@ logging.config=classpath:${LOG_CONFIG:log4j2-spring.xml}
 
 
 spring.datasource.typd=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.url=jdbc:mysql://139.224.43.89:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&allowMultiQueries=true&rewriteBatchedStatements=true
+spring.datasource.url=jdbc:mysql://139.224.43.89:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
 spring.datasource.username=comac
 spring.datasource.password=2024*Comac
 spring.servlet.multipart.max-file-size=500MB

facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserModiRequest.java

@@ -1,6 +1,6 @@
 package com.electromagnetic.industry.software.data.manage.request.user;
 
-import cn.hutool.core.date.DateTime;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import electromagnetic.data.framework.share.model.BaseRequest;
 import lombok.Data;
 
@@ -46,7 +46,8 @@ public class UserModiRequest extends BaseRequest implements Serializable {
     /**
      * 入职日期
      */
-    private DateTime joinTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date joinTime;
 
     /**
      * 工作状态
@@ -56,5 +57,6 @@ public class UserModiRequest extends BaseRequest implements Serializable {
     /**
      * 实习截止日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date internshipEndDate;
 }

facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserRequest.java

@@ -1,6 +1,7 @@
 package com.electromagnetic.industry.software.data.manage.request.user;
 
 import cn.hutool.core.date.DateTime;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import electromagnetic.data.framework.share.model.BaseRequest;
 import lombok.Data;
 
@@ -41,7 +42,8 @@ public class UserRequest extends BaseRequest implements Serializable {
     /**
      * 入职日期
      */
-    private DateTime joinTime;
+    @JsonFormat(pattern="yyyy-MM-dd")
+    private Date joinTime;
 
     /**
      * 工作状态
@@ -51,6 +53,7 @@ public class UserRequest extends BaseRequest implements Serializable {
     /**
      * 实习截止日期
      */
+    @JsonFormat(pattern="yyyy-MM-dd")
     private Date internshipEndDate;
 
 }

facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/user/SingleUserResponse.java

@@ -1,5 +1,6 @@
 package com.electromagnetic.industry.software.data.manage.response.user;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -52,6 +53,7 @@ public class SingleUserResponse {
     /**
      * 入职日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date joinTime;
 
     /**
@@ -62,6 +64,7 @@ public class SingleUserResponse {
     /**
      * 实习截止日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date internshipEndDate;
 
     /**

infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml

@@ -79,7 +79,7 @@
         <if test="userTitle != null and userTitle != ''">user_title = #{userTitle},</if>
         <if test="joinTime != null">join_time = #{joinTime},</if>
         <if test="userStatus != null and userStatus != ''">user_status = #{userStatus},</if>
-        <if test="internshipEndDate != null">internship_end_date = #{internshipEndDate},</if>
+        internship_end_date = #{internshipEndDate},
         <if test="modifier != null and modifier != ''">modifier = #{modifier},</if>
         <if test="modifierName != null and modifierName != ''">modifier_name = #{modifierName},</if>
         gmt_modified=now()

service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappersImpl.java

@@ -19,8 +19,8 @@ import javax.annotation.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-12-04T09:28:17+0800",
-    comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_432 (Temurin)"
+    date = "2024-12-05T15:02:06+0800",
+    comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_281 (Oracle Corporation)"
 )
 public class UserMappersImpl implements UserMappers {