Merge remote-tracking branch 'origin/master'

liujie

2023-10-10 cd45ac2fa0097de2fd9bf637fc5a23593be1aef0

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

@@ -165,6 +165,10 @@
    private Integer shelves;
    @TableField("cardType")
    private Integer cardType;
    @TableField("status")
    private Integer status;
    @TableField("remark")
    private String remark;

    @Override
    protected Serializable pkVal() {