Merge branch 'test' into 'master'

罗元桥

2021-09-06 76d62344e9df95fb5a80b62a6f7a95d4577949a9

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java

@@ -103,4 +103,13 @@
     */
    @PostMapping("/loginGridBackstage")
    R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password);

    /**
     * 城管后台登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    @PostMapping("/loginCgBackage")
    R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password);
}