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

luliqiang

2020-07-15 02dcc4c9d043c44d0fa88490904046008fcf4afc

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

@@ -36,5 +36,5 @@
     * @param userName
     * @return SysDoctor
     */
    SysDoctor userIsAdmin(String userName);
    SysDoctor userIsAdmin(@Param("userName") String userName);
}