From cdaebe51694f592fc95cd6e19ab3f5f4d450c862 Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Mon, 19 Apr 2021 14:23:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/crms/CustomerWorkbenchDao.xml | 2 +-
 .../domain/crms/response/CustomerWorkbenchListVO.java       | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CustomerWorkbenchDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CustomerWorkbenchDao.xml
index 2473c92f..e95426cd 100644
--- a/dq-financial-crms/src/main/resources/mapper/crms/CustomerWorkbenchDao.xml
+++ b/dq-financial-crms/src/main/resources/mapper/crms/CustomerWorkbenchDao.xml
@@ -22,7 +22,7 @@
 
     <!-- 查询客户列表(所有)、根据创建时间筛选、根据客户类型筛选、根据客户编号或者名称搜索 -->
     <select id="queryList" parameterType="com.daqing.framework.domain.crms.request.CustomerWorkbenchRequest" resultType="com.daqing.framework.domain.crms.response.CustomerEntityResponse">
-        SELECT cc.id,cc.code,cc.type,cc.name,cc.phone,cc.manager,ccc.id as companyId
+        SELECT cc.id,cc.code,cc.type,cc.name,cc.phone,cc.manager,ccc.id as companyId, cc.create_time as createTime
         FROM crms_customer cc
         LEFT JOIN crms_company_customer ccc on ccc.customer_id=cc.id
         WHERE cc.del_or_not = 0
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CustomerWorkbenchListVO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CustomerWorkbenchListVO.java
index ae32b2ec..252253ca 100644
--- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CustomerWorkbenchListVO.java
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CustomerWorkbenchListVO.java
@@ -1,10 +1,12 @@
 package com.daqing.framework.domain.crms.response;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -43,4 +45,8 @@ public class CustomerWorkbenchListVO implements Serializable {
 
     @ApiModelProperty(value = "企业id")
     private Long companyId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
 }