From 1724f77c35022b643c28dd3e5547679a5edc2d49 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 17 三月 2026 14:17:26 +0800
Subject: [PATCH] Merge branch 'springboot3.5_cs' into spring3.5

---
 rsf-framework/src/main/resources/templates/react-admin/Entity.txt |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/rsf-framework/src/main/resources/templates/react-admin/Entity.txt b/rsf-framework/src/main/resources/templates/react-admin/Entity.txt
index 8743146..b16dfe4 100644
--- a/rsf-framework/src/main/resources/templates/react-admin/Entity.txt
+++ b/rsf-framework/src/main/resources/templates/react-admin/Entity.txt
@@ -5,14 +5,12 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import com.vincent.rsf.framework.common.Cools;
 import com.vincent.rsf.framework.common.SpringUtils;
-import com.vincent.rsf.manager.system.service.UserService;
-import com.vincent.rsf.manager.system.service.HostService;
-
+import com.vincent.rsf.server.system.service.UserService;
+import com.vincent.rsf.server.system.entity.User;
 import java.io.Serializable;
 import java.util.Date;
 

--
Gitblit v1.9.1