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

houruijun

2020-08-20 e4ac82fd428335020eb6522fc642b4fd91eb86f0

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysUserOrgMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return SysUserOrg对象
     */
    SysUserOrg findByObject(SysUserOrg sysUserOrg);
    SysUserOrg findByObject(@Param("p") SysUserOrg sysUserOrg);
}