Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-23 acad524bfb7f376c09ff8e6600fab207780156e1

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

@@ -169,7 +169,12 @@
    private Integer status;
    @TableField("remark")
    private String remark;

    // 已领数量
    @TableField(exist = false)
    private Integer pickUpQuantity3;
    // 已兑换数量
    @TableField(exist = false)
    private Integer pickUpQuantity4;
    @Override
    protected Serializable pkVal() {
        return this.id;