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

mitao

2025-04-01 5af799118134eb1f77bb310433825fe7cf11e680

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

@@ -33,8 +33,6 @@
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    @TableField("agreementId")
    private Integer agreementId;
    /**
     * 协议名称
     */
@@ -48,16 +46,10 @@

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

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


}