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

无关风月

8 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

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

@@ -66,6 +66,11 @@
    @TableField("insertTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date insertTime;
    /**
     * 是否为会员赠送 0否1是
     */
    @TableField("isVipGrant")
    private Integer isVipGrant;


    @Override