From c6f6823f2ade5d0a8fd45df67d3cb109eced89d2 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Tue, 25 Oct 2022 14:05:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=97=B6=E9=97=B4=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/resource/ResourceDao.xml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index a19e71f6..d8d1828e 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -1868,7 +1868,7 @@
     </select>
 
     <select id="selectCensusResourceTable" resultType="java.util.Map">
-        SELECT sd.name AS deptName, tdr.name AS resourceName, tdr.type, tdr.create_date AS createDate,
+        SELECT sd.name AS deptName, tdr.name AS resourceName, tdr.type, DATE_FORMAT(tdr.create_date,'%Y-%m-%d %T') AS createDate,
         CASE WHEN (tdr.del_flag=0 OR tdr.del_flag=5) THEN '通过' WHEN tdr.del_flag=6 THEN '不通过' ELSE '审核中' END AS
         approveStatus, trma.instance_id AS applyNumber
         FROM (SELECT IF(d.type='组件服务', a.attr_value, d.type) AS type, d.id, d.del_flag, d.dept_id, d.create_date,
@@ -1911,7 +1911,7 @@
         tdr.NAME AS resourceName,
         dept.`name` AS resourceDeptName,
         tdr.type,
-        taa.create_date AS createDate,
+        DATE_FORMAT(tdr.create_date,'%Y-%m-%d %T') AS createDate,
         taa.approve_status AS approveStatus,
         taa.apply_flag AS applyNumber
         FROM