Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-23 acad524bfb7f376c09ff8e6600fab207780156e1

 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;