Merge remote-tracking branch 'origin/dev' into dev

侯瑞军

2020-05-14 293d5042a773595ded45bdc9c69c4555ab9c5dd5

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java

@@ -3,7 +3,9 @@
import com.kidgrow.common.model.*;
import com.kidgrow.common.service.ISuperService;
import com.kidgrow.usercenter.model.SysUserExcel;
import org.springframework.web.bind.annotation.RequestBody;

import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -105,4 +107,10 @@
    * 删除用户
    */
   boolean delUser(Long id);

   ResultBody findAll(Map<String, Object> map);

   ResultBody getThisUserOrganizationUser(HttpServletRequest request);

   ResultBody findCountByMap(Map<String, Object> map);
}