From 9140edf9b115a6b38c599878093d595ef84228f1 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sun, 12 Jul 2020 17:10:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysCompanyService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysCompanyService.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysCompanyService.java
index f33c695..a6e89b2 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysCompanyService.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysCompanyService.java
@@ -1,6 +1,7 @@
 package com.kidgrow.usercenter.service;
 
 import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysUser;
 import com.kidgrow.usercenter.model.SysCompany;
 import com.kidgrow.common.model.PageResult;
 import com.kidgrow.common.service.ISuperService;
@@ -22,7 +23,7 @@
      * @param params
      * @return
      */
-    PageResult<SysCompanyVo> findList(Map<String, Object> params);
+    PageResult<SysCompanyVo> findList(Map<String, Object> params, SysUser user);
 
 
     /**

--
Gitblit v1.8.0