Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

20 小时以前 2b2e8603381d62b5da4a817710b33d583561ff3f

 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