合并代码

puzhibing

2024-03-05 6c6d51775200fc1c17b0cd5fc9464016aed13327

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

@@ -175,6 +175,7 @@
    // 已兑换数量
    @TableField(exist = false)
    private Integer pickUpQuantity4;

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