Merge remote-tracking branch 'origin/master'

nickchange

2023-10-27 200acf9283ff06e75874df263b1e125a71e76215

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

@@ -35,6 +35,13 @@
        <if test="objType == 1">
          and  auditStatus =2
        </if>
        where 1=1
        <if test="operatorId != null">
            and cityManagerId = #{operatorId}
        </if>
        <if test="objType == 1">
          and  auditStatus =2
        </if>
        <if test="cityCode != null">
           and id in(
            SELECT DISTINCT couponId FROM
@@ -66,6 +73,7 @@
        <if test="state != null">
            and `state` = #{state}
        </if>

          order by insertTime desc
    </select>
    <select id="queryCouponListOfSearch1" resultType="java.util.Map">