Merge remote-tracking branch 'origin/master'

puzhibing

2024-01-03 168d852672f8f671a01d6f0f053349d0d321ec7c

 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;