Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-28 3c12858927ce26f277ba758e520c81be599d8df1

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

@@ -163,6 +163,18 @@
     */
    @TableField("shelves")
    private Integer shelves;
    @TableField("cardType")
    private Integer cardType;
    @TableField("status")
    private Integer status;
    @TableField("remark")
    private String remark;
    // 已领数量
    @TableField(exist = false)
    private Integer pickUpQuantity3;
    // 已兑换数量
    @TableField(exist = false)
    private Integer pickUpQuantity4;

    @Override
    protected Serializable pkVal() {