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

luliqiang

2020-07-12 9140edf9b115a6b38c599878093d595ef84228f1

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