From fdc1bd4ed5a1aced99556bed3bd27843eae6559c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 16 十一月 2022 10:04:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/service/ISysUserService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/service/ISysUserService.java b/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
index ad5aa5d..aa6ac87 100644
--- a/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
+++ b/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
@@ -15,7 +15,7 @@
      * @return 参数配置信息
      */
     public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,
-                                          String userName,List<String> ids);
+                                          String userName,List<String> ids,String isDivisionHead);
 
 
     SysUser selectData(String userId,String phonenumber,String loginName);
@@ -49,7 +49,7 @@
      *
      * @return 结果
      */
-    public int selectNum(String userType,String userName,List<String> ids);
+    public int selectNum(String userType,String userName,List<String> ids,String  isDivisionHead);
 
     /**
      * 发送验证码(如果没有该用户则新建用户)

--
Gitblit v1.7.1