Merge branch 'test_future_wangge' into test

CeDo

2021-05-31 ebea64fcbd2b7881863755ec38e5cf37cdb60658

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java

@@ -143,4 +143,32 @@
        return R.ok(loginReturnVO);
    }


    /**
     * 网格综治APP登录
     *
     * @param account  账户
     * @param password 密码
     * @return 登录结果
     */
    @PostMapping("/loginGridApp")
    public R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginGridApp(account, password);
        return R.ok(loginReturnVO);
    }


    /**
     * 网格综治后台登录
     *
     * @param account  账户
     * @param password 密码
     * @return 登录结果
     */
    @PostMapping("/loginGridBackstage")
    public R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginGridBackstage(account, password);
        return R.ok(loginReturnVO);
    }

}