From 3707ace2281019ed0421b59674fc549020239903 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期三, 29 十一月 2023 09:32:47 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml b/hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml
index 49fd4d7..6409c6a 100644
--- a/hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml
+++ b/hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml
@@ -236,8 +236,9 @@
SELECT
t.*,
spu.real_name realName,
- spu.user_type userTypeName
- FROM t_integral_detail t
+ spu.user_type userTypeName,
+ DATE_FORMAT(t.createTime, '%Y-%m-%d %H:%m:%s') createDate
+ FROM t_integral_detail t
LEFT JOIN sys_plat_user spu on spu.user_id = t.userId
WHERE t.isUse = 1 and t.type = 2 and t.companyId = #{companyId}
<if test="userId != null and userId !=''">
@@ -280,7 +281,7 @@
<select id="selectSafeIntegralInfo" resultType="com.thhy.secure.modules.biz.integralAccount.entity.IntegralDetailDto">
SELECT
t.*,
- DATE_FORMAT(t.createTime, '%Y-%m-%d') createDate
+ DATE_FORMAT(t.createTime, '%Y-%m-%d %H:%m:%s') createDate
FROM t_integral_detail t
WHERE t.isUse = 1
<if test="companyId != null and companyId !=''">
--
Gitblit v1.9.3