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

huanghongfa

2021-08-19 c40be027ef8068b9a77bb24c94291dee25f563d8

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java

@@ -1,6 +1,7 @@
package com.panzhihua.auth.service;

import com.panzhihua.common.model.vos.LoginReturnVO;
import com.panzhihua.common.model.vos.LoginReturnsVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;

/**
@@ -63,7 +64,7 @@
     * @param password 密码
     * @return 登录结果
     */
    LoginReturnVO loginGridApp(String account, String password);
    LoginReturnsVO loginGridApp(String account, String password);

    /**
     * 网格综治后台登录