Merge branch 'V2.0.3' of ssh://103.249.252.28:10022/lcy/education

# Conflicts:
#	src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java

src/main/java/org/rcisoft/business/bagency/controller/BAgencyController.java

@@ -57,6 +57,7 @@ public class BAgencyController extends PaginationController<BAgency> {
     }
 
     @ApiOperation(value="查询教学单位下是否有用户", notes="查询教学单位下是否有用户")
+    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
     @GetMapping(value = "/selectBAgencyHaveUser")
     public String HaveUserOrNot(@ApiIgnore BAgency bAgency) {
         bAgency.setCreateBy(UserUtil.getUserInfoProp(getToken(), UserUtil.USER_ID));