Merge branch 'ijkdev' of chenweida/wlyy2.0 into ijkdev

app/app-iot-server/src/main/java/com/yihu/ehr/iot/service/common/LoginService.java

@@ -158,7 +158,7 @@ public class LoginService extends BaseService {
    /**
     * 用户名密码登录
     *
     *test
     * @param request
     * @param userName
     * @param password