From e973fb747f0d1a382fb9e4cdb20383a0a546ef67 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 03 十二月 2024 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/OrgDepartmentQueryController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/OrgDepartmentQueryController.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/OrgDepartmentQueryController.java
index 5b3a1bb..382495d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/OrgDepartmentQueryController.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/OrgDepartmentQueryController.java
@@ -1,7 +1,6 @@
-package com.vci.frameworkcore.controller;
+package com.vci.web.controller;
 
 import com.vci.dto.OrgDepartmentDTO;
-import com.vci.frameworkcore.compatibility.OrgDeptQueryServiceI;
 import com.vci.constant.FrameWorkLangCodeConstant;
 import com.vci.pagemodel.OrgDepartmentVO;
 import com.vci.starter.web.annotation.controller.VciUnCheckRight;
@@ -11,7 +10,8 @@
 import com.vci.starter.web.util.LangBaseUtil;
 import com.vci.starter.web.util.LocalFileUtil;
 import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.util.Func;
+import com.vci.starter.web.util.Lcm.Func;
+import com.vci.web.service.OrgDeptQueryServiceI;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

--
Gitblit v1.9.3