From c0f6294b0be6789fddd652f89f820fcf6d5526cf Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 06 七月 2023 17:32:39 +0800
Subject: [PATCH] 合并代码
---
cloud-server-activity/src/main/resources/mapper/UserCouponMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloud-server-activity/src/main/resources/mapper/UserCouponMapper.xml b/cloud-server-activity/src/main/resources/mapper/UserCouponMapper.xml
index 4cd1ab4..2c04ccd 100644
--- a/cloud-server-activity/src/main/resources/mapper/UserCouponMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/UserCouponMapper.xml
@@ -9,8 +9,8 @@
b.`name`,
b.type,
b.content,
- DATE_FORMAT('%y-%M-%d', b.startTime) as startTime,
- DATE_FORMAT('%y-%M-%d', b.endTime) as endTime
+ DATE_FORMAT(b.startTime, '%Y-%m-%d') as startTime,
+ DATE_FORMAT(b.endTime, '%Y-%m-%d') as endTime
from t_user_coupon a
left join t_coupon b on (a.couponId = b.id)
where a.`status` = 1 and b.type != 3 and a.userId = #{uid} and (
--
Gitblit v1.7.1