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

无关风月

2025-08-22 f38d69d70e3e126d2f58971d0b4854f2aa144fc1

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

@@ -71,6 +71,11 @@
     */
    @TableField("isVipGrant")
    private Integer isVipGrant;
    /**
     * vipDetailId 会员权益赠送记录id
     */
    @TableField("vipDetailId")
    private Integer vipDetailId;


    @Override