Merge remote-tracking branch 'origin/master'

44323

2023-10-11 f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3

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

@@ -163,6 +163,12 @@
     */
    @TableField("shelves")
    private Integer shelves;
    @TableField("cardType")
    private Integer cardType;
    @TableField("status")
    private Integer status;
    @TableField("remark")
    private String remark;

    @Override
    protected Serializable pkVal() {