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

侯瑞军

2020-04-10 2ba1e026deb6772ddf6bf28093fc3b6d194b32eb

 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;
@@ -107,4 +109,6 @@
   boolean delUser(Long id);

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

   ResultBody getThisUserOrganizationUser(HttpServletRequest request);
}