From 83a232d2b5cb9c6d90c987c25bdbea200d1313cd Mon Sep 17 00:00:00 2001
From: zhang chengzhi <3144712872@qq.com>
Date: Sat, 10 Aug 2024 10:08:48 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../muyu/cloud/pay/domain/resp/CustomerResp.java   | 14 ++++++++------
 cloud-pay-server/pom.xml                           | 11 ++++++-----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerResp.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerResp.java
index a099f5a..e03a16e 100644
--- a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerResp.java
+++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerResp.java
@@ -10,6 +10,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 import java.util.List;
@@ -44,7 +45,7 @@ public class CustomerResp {
      * 服务/客户名称
      */
     @Excel(
-            name = "登录名称"
+            name = "客户名称"
     )
     @Schema(description = "客户名称", defaultValue = "商品服务", type = "String")
     private String appName;
@@ -53,9 +54,9 @@ public class CustomerResp {
      * 服务/客户编码
      */
     @Excel(
-            name = "登录名称"
+            name = "客户编码"
     )
-    @Schema(description = "客户ID", defaultValue = "cloud_order", type = "String")
+    @Schema(description = "客户编码", defaultValue = "cloud_order", type = "String")
     private String appCode;
 
 
@@ -63,19 +64,20 @@ public class CustomerResp {
      * 状态
      */
     @Excel(
-            name = "登录名称"
+            name = "客户状态"
     )
     @Schema(description = "客户状态,同数据字典-系统是否", defaultValue = "Y", type = "String")
     private String status;
     @Excel(
-            name = "登录名称"
+            name = "创建人"
     )
     @Schema(description = "创建人", defaultValue = "muyu", type = "String")
     private String createBy;
     @Excel(
-            name = "登录名称"
+            name = "创建时间"
     )
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间", defaultValue = "2024-8-1 0:22:36", type = "Date")
     private Date createTime;
 
diff --git a/cloud-pay-server/pom.xml b/cloud-pay-server/pom.xml
index 6dabb15..6f2066c 100644
--- a/cloud-pay-server/pom.xml
+++ b/cloud-pay-server/pom.xml
@@ -11,11 +11,12 @@
 
     <artifactId>cloud-pay-server</artifactId>
 
-<!--    <properties>-->
-<!--        <maven.compiler.source>17</maven.compiler.source>-->
-<!--        <maven.compiler.target>17</maven.compiler.target>-->
-<!--        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>-->
-<!--    </properties>-->
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
     <dependencies>
 
         <!-- SpringCloud Alibaba Nacos -->