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

luofl

2025-04-11 2fc4d1e0a7d1e786c99f3d113ac4449be2659c3f

 cloud-server-activity/src/main/java/com/dsh/activity/entity/CouponCity.java

@@ -25,7 +25,6 @@
@TableName("t_coupon_city")
public class CouponCity extends Model<CouponCity> {

    private static final long serialVersionUID = 1L;

    /**
     * 主键
@@ -35,6 +34,7 @@
    /**
     * 优惠券id
     */
    @TableField("couponId")
    private Integer couponId;
    /**
     * 省