Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-10-30 21ee583563d59d9d04840f65cb0053df9b183554

 cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml

@@ -84,9 +84,14 @@
        quantityIssued,
        pickUpQuantity,
        `sort`,
        shelves
        shelves,
        status auditStatus
        from t_points_merchandise
        where status =1
        where 1=1

        <if test="query.objType == 1">
            and  status =1
        </if>
        <if test="query.name != null">
            and `name` like concat('%', #{query.name}, '%')
        </if>