From 5667d14c708f9244fe2419707f98ff472ca23480 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 30 七月 2024 16:30:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 80c7b3c..7d37b4b 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,6 +2,7 @@
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;
@@ -219,7 +220,7 @@
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, String nickname, String phonenumber,
- Integer status);
+ Integer status,Long deptId);
PageInfo<SysUser> getAllList(PageInfo<SysUser> pageInfo, List<Integer> collect);
@@ -236,6 +237,8 @@
*/
PageDTO<SupplierVO> getSupplierPage(SupplierQuery query);
+ List<SysUser> getSupplierPage1();
+
/**
* 添加/编辑供应商
*
@@ -252,6 +255,8 @@
PageDTO<ConservatorVO> getConservatorPage(ConservatorQuery query);
+ List<SysUser> getConservatorPage1();
+
void saveConservator(ConservatorDTO dto);
void deleteConservator( Long id);
--
Gitblit v1.7.1