Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-01 e5ed9472ff4b5bf2f26e5beb6a77af571057b79b

 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointsMerchandise.java

@@ -166,6 +166,9 @@
    @TableField("cardType")
    private Integer cardType;

    @TableField("status")
    private Integer status;

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