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

mitao

2025-04-11 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9

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

@@ -48,16 +48,10 @@

    @TableField("agreementContent")
    private String agreementContent;
    /**
     *协议管理id
     */
    @ApiModelProperty("协议管理id")
    @TableField("agreementId")
    private Integer agreementId;

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


}