From 331ae50b1cdcb31a4a0c182abb82aec5c1b12f83 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 15 十一月 2023 09:40:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml b/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
index 8754c60..e58d540 100644
--- a/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
@@ -107,7 +107,6 @@
<if test="query.state != null">
and `state` = #{query.state}
</if>
- AND endTime >= NOW()
and `type` = 3
order by sort desc
</select>
--
Gitblit v1.7.1