From 573123827763851bba3ac301aba7515ff4ae037b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 24 二月 2025 17:42:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/ProblemTypeController.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/ProblemTypeController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/ProblemTypeController.java
index a6cba57..e0109ac 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/ProblemTypeController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/ProblemTypeController.java
@@ -5,8 +5,8 @@
 import com.panzhihua.common.controller.BaseController;
 import com.panzhihua.common.interfaces.OperLog;
 import com.panzhihua.common.model.vos.R;
-import com.panzhihua.sangeshenbian.model.ProblemType;
-import com.panzhihua.sangeshenbian.model.SystemUser;
+import com.panzhihua.sangeshenbian.model.entity.ProblemType;
+import com.panzhihua.sangeshenbian.model.entity.SystemUser;
 import com.panzhihua.sangeshenbian.service.IProblemTypeService;
 import com.panzhihua.sangeshenbian.service.ISystemUserService;
 import io.swagger.annotations.Api;
@@ -17,7 +17,6 @@
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 
 /**
  * @author zhibing.pu

--
Gitblit v1.7.1