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

CeDo

2021-05-31 2af7739a8517d2d54c0b4f14af5c77e036cf653e

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

@@ -63,4 +63,22 @@
     */
    @PostMapping("/loginShopBackStage")
    R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password")String password);

    /**
     * 网格综治APP登录
     * @param account 账户
     * @param password 密码
     * @return 登录结果
     */
    @PostMapping("/loginGridApp")
    R loginGridApp(@RequestParam("account") String account, @RequestParam("password")String password);

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