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/SysOrganizationMapper.java

@@ -30,7 +30,7 @@
     * @param
     * @return SysOrganization对象
     */
    SysOrganization findByObject(SysOrganization sysOrganization);
    SysOrganization findByObject(@Param("p") SysOrganization sysOrganization);


    /**