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

44323

2023-09-16 a99684a9a4ecbdd71d1c93ef824f7741ff52c5d9

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

@@ -149,7 +149,18 @@
     */
    @TableField("insertTime")
    private Date insertTime;

    /**
     * 课包支付配置id
     */
    @TableField("coursePackageConfigId")
    private Integer coursePackageConfigId;
    /**
     * 1=上架 2=下架
     */
    @TableField("shelves")
    private Integer shelves;
    @TableField("cardTye")
    private Integer cardTye;

    @Override
    protected Serializable pkVal() {