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

zhaoxiaohao

2020-04-10 eab02ab1453dc1f1e9933077dde1cef67d798936

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