Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-28 3c12858927ce26f277ba758e520c81be599d8df1

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

@@ -32,7 +32,7 @@
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.INPUT)
    @TableId(value = "id", type = IdType.NONE)
    private Long id;
    /**
     * 优惠券id