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

zhaoxiaohao

2020-07-15 1ad851e4eb8c972eeb2fee7f2d1d54d3e32068a9

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