From 2b2e8603381d62b5da4a817710b33d583561ff3f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 12 九月 2025 09:27:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml | 2 +-
1 files changed, 1 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 13b2455..4ae714c 100644
--- a/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
@@ -105,7 +105,7 @@
and userPopulation = #{query.userPopulation}
</if>
<if test="query.state != null">
- and `state` = #{query.state}
+ and `shelves` = #{query.state}
</if>
and `type` = 3
order by sort desc
--
Gitblit v1.7.1