From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
index ff08b37..bf457a0 100644
--- a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
@@ -18,7 +18,7 @@
<select id="getAmount" resultType="com.dsh.activity.model.PointMerchandiseIncomeVo">
- select t1.*,t2.cash from t_user_points_merchandise t1
+ select t1.insertTime,t2.cash from t_user_points_merchandise t1
left join t_points_merchandise t2 on t1.pointsMerchandiseId = t2.id
where t1.payStatus =2
</select>
--
Gitblit v1.7.1