Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-17 f721ee13dc5f95f607bb25b09f73cae6a7123ed9

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

@@ -54,4 +54,13 @@
     */
    @PostMapping("/refreshToken")
    R refreshToken(@RequestParam("refreshToken")String refreshToken);

    /**
     * 商家后台登录
     * @param account 账户
     * @param password 密码
     * @return 登录结果
     */
    @PostMapping("/loginShopBackStage")
    R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password")String password);
}