From 9a60b1e59f52ab4f41e956a76eac1150f39843e3 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 11 四月 2025 20:08:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminAgreementSetting.java | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminAgreementSetting.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminAgreementSetting.java index c04ba86..ab59caf 100644 --- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminAgreementSetting.java +++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminAgreementSetting.java @@ -37,13 +37,11 @@ * 协议名称 */ @TableField("agreementName") - @JSONField(name = "title") private String agreementName; /** *协议内容 */ @TableField("agreementContent") - @JSONField(name = "content") private String agreementContent; @Override -- Gitblit v1.7.1