Merge remote-tracking branch 'origin/master'

nickchange

2023-12-08 1b9a01bf5000714b08a75a50dd1f5f3eab65d888

 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;