From 2fb6c67b2c0c72195eef6fe5f7904d739b46e2c0 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:57:28 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentDepartmentServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentDepartmentServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentDepartmentServiceImpl.java
index 62b1ccd..8d6d422 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentDepartmentServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentDepartmentServiceImpl.java
@@ -6,9 +6,9 @@
 import org.jeecg.modules.dnc.entity.ComponentDepartment;
 import org.jeecg.modules.dnc.mapper.ComponentDepartmentMapper;
 import org.jeecg.modules.dnc.service.IComponentDepartmentService;
-import org.jeecg.modules.dnc.ucenter.Department;
 import org.jeecg.modules.dnc.utils.ValidateUtil;
 import org.apache.commons.collections4.ListUtils;
+import org.jeecg.modules.system.entity.MdcProduction;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
@@ -27,12 +27,12 @@
     }
 
     @Override
-    public List<Department> getDepartPermsByComponentId(String componentId) {
+    public List<MdcProduction> getDepartPermsByComponentId(String componentId) {
         return super.getBaseMapper().getDepartPermsByComponentId(componentId);
     }
 
     @Override
-    public List<Department> getDepartNonPermsByComponentId(String componentId) {
+    public List<MdcProduction> getDepartNonPermsByComponentId(String componentId) {
         return super.getBaseMapper().getDepartNonPermsByComponentId(componentId);
     }
 

--
Gitblit v1.9.3