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

houruijun

2020-11-02 f14deee7baaf82e7aad6fc81a2509ba88e869afd

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

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