Merge branch 'pay_master' into dev

bingbing

2020-10-26 34589cd092e0de8cfd704cd59608ed0f36f6093a

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

@@ -36,5 +36,7 @@
    boolean saveOrUpdateSer(SysRoleOrganizationDto sysRoleOrganizationDto, SysUser user);

    ResultBody getTree(Map<String, Object> params,SysUser user);

    Map<String, Object> getRoleOrgMap( SysUser user);
}