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

houruijun

2020-08-21 cdf8f1e691531a6fb1c3462d0ad70df7f68c0047

 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);


    /**