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

puzhibing

2023-12-08 32106f511657695e79d53e98a350ce70a36f6da1

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

@@ -163,6 +163,17 @@
     */
    @TableField("shelves")
    private Integer shelves;
    @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() {