From 2fc4d1e0a7d1e786c99f3d113ac4449be2659c3f Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期五, 11 四月 2025 09:09:37 +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/THuiminAgreement.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminAgreement.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminAgreement.java
index c0fd57a..e747aa1 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminAgreement.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminAgreement.java
@@ -45,7 +45,7 @@
private String agreementSettings;
- private List<THuiminAgreementSetting> tHuiminAgreementSettingList;
+ private List<THuiminAgreementSetting> settingList;
private Integer objectType;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1