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

无关风月

2024-07-24 b23b243473fc9ab20ca62eebf3668c143e2e7d23

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

@@ -166,6 +166,15 @@
    @TableField("cardType")
    private Integer cardType;

    @TableField("status")
    private Integer status;
    // 已领数量
    @TableField(exist = false)
    private Integer pickUpQuantity3;
    // 已兑换数量
    @TableField(exist = false)
    private Integer pickUpQuantity4;

    @Override
    protected Serializable pkVal() {
        return this.id;