Merge remote-tracking branch 'origin/master'

nickchange

2023-12-08 1b9a01bf5000714b08a75a50dd1f5f3eab65d888

 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;