Merge remote-tracking branch 'origin/master'

nickchange

2023-11-14 a1d261d6c92c38d9e496e11d1bc224ecc1d34798

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

@@ -164,7 +164,9 @@
               userPopulation,
               quantityIssued,
               pickUpQuantity,
               auditStatus
               auditStatus,
        publisherType,
        cityManagerId
        from t_coupon
        where auditStatus != 2
        <if test="name != null">