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

Pu Zhibing

2024-09-24 1b8ad0cc6a79f84fb32fdffae39742afa964748e

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

@@ -30,7 +30,8 @@
        state,
        illustrate,
        auditStatus,
        publisherType
        publisherType,
        cityManagerId
        from t_coupon
        where 1=1
        <if test="objType == 3">