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

无关风月

2025-04-11 9a60b1e59f52ab4f41e956a76eac1150f39843e3

 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminAgreementSetting.java

@@ -1,5 +1,6 @@
package com.dsh.course.feignClient.activity.model;

import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;