Merge remote-tracking branch 'origin/2.0' into 2.0

luofl

2025-04-11 2fc4d1e0a7d1e786c99f3d113ac4449be2659c3f

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

@@ -57,14 +57,13 @@
     */
    @TableField("storeNoHuiminCardIntro")
    @ApiModelProperty("门店无惠民卡介绍页")

    private String storeNoHuiminCardIntro;

    @TableField(exist = false)
    private Integer objectType;

    @TableField(exist = false)
    private List<THuiminAgreementSetting> tHuiminAgreementSettingList;
    private List<THuiminAgreementSetting> settingList;
    @Override
    protected Serializable pkVal() {
        return this.id;