Merge remote-tracking branch 'origin/lyq_battery_shop' into diandongche

101captain

2022-08-15 bfbfe7d5fd6c90d5f7359762223ce4bd1cc7cfa1

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

@@ -271,4 +271,19 @@
        LoginReturnVO loginReturnVO=loginService.tfLogin(account,password,appid);
        return R.ok(loginReturnVO);
    }

    /**
     * 电动车商城后台用户登录
     *
     * @param account
     *            账户
     * @param password
     *            密码
     * @return 登录结果
     */
    @PostMapping("/loginBatteryUser")
    public R loginBatteryUser(@RequestParam("account") String account, @RequestParam("password") String password) {
        LoginReturnVO loginReturnVO = loginService.loginBatteryUser(account, password);
        return R.ok(loginReturnVO);
    }
}