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

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