Merge branch 'bigscreen_dev'

101captain

2021-12-23 7d9fbfdc05485c8e2cb457dffb1fd29580dfb41b

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

@@ -227,4 +227,16 @@
        LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password);
        return R.ok(loginReturnVO);
    }

    /**
     * 西区大屏登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    @PostMapping("/loginXQDP")
    public R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password);
        return R.ok(loginReturnVO);
    }
}