Merge branch 'pay_master' into dev

bingbing

2020-10-26 34589cd092e0de8cfd704cd59608ed0f36f6093a

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


    /**