代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

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

@@ -114,6 +114,15 @@
    R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password);

    /**
     * 一键报警APP登录
     * @param account   账号
     * @param password  密码
     * @return  登录结果
     */
    @PostMapping("/loginAlarmApp")
    R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password);

    /**
     * 便民服务商家后台登录
     *
     * @param account