From b5ef65d0103a71dc7af2b9be6d2ac43aca5bb726 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 27 八月 2024 08:59:57 +0800 Subject: [PATCH] 代码提交 bug解决 --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index 673c023..3fb3c18 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -2,12 +2,10 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.utils.page.PageDTO; +import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.domain.dto.ConservatorDTO; -import com.ruoyi.system.domain.dto.ConservatorQuery; -import com.ruoyi.system.domain.dto.SupplierDTO; -import com.ruoyi.system.domain.dto.SupplierQuery; +import com.ruoyi.system.domain.dto.*; import com.ruoyi.system.domain.vo.ConservatorVO; import com.ruoyi.system.domain.vo.SupplierVO; import org.springframework.validation.annotation.Validated; @@ -236,6 +234,8 @@ */ PageDTO<SupplierVO> getSupplierPage(SupplierQuery query); + List<SysUser> getSupplierPage1(); + /** * 添加/编辑供应商 * @@ -251,6 +251,9 @@ void deleteSupplier(Long id); PageDTO<ConservatorVO> getConservatorPage(ConservatorQuery query); + List<SysUser> getConservatorPage2(ConservatorQueryA query); + + List<SysUser> getConservatorPage1(String grade); void saveConservator(ConservatorDTO dto); -- Gitblit v1.7.1