Merge branch 'test' into 'zzj'

罗元桥

2021-09-16 5dc04f3291c00d66f8733a49896612ea1e3b31c5

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

@@ -185,4 +185,16 @@
        return R.ok(loginReturnVO);
    }

    /**
     * 城管后台登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    @PostMapping("/loginCgBackage")
    public R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginCgBackage(account, password);
        return R.ok(loginReturnVO);
    }

}