Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

无关风月

2 天以前 8a5b6dedd18a0956ffa8da7ec9ace30b1d8238fc

 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/TPayHuimin.java

@@ -16,7 +16,7 @@

/**
 * <p>
 * 惠民卡
 * 玩湃惠民卡
 * </p>
 *
 * @author jqs
@@ -90,7 +90,7 @@
    @TableField("refundStatus")
    private Integer refundStatus;
    /**
     *惠民卡id
     *玩湃惠民卡id
     */
    @TableField("cardId")
    private Integer cardId;