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

Pu Zhibing

2025-01-24 4b1453e19306592f703aa794e238bd028f67d320

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

@@ -159,6 +159,7 @@
    @TableField("cityManagerId")
    private Integer cityManagerId;


    @Override
    protected Serializable pkVal() {
        return this.id;