From 57cdf0d3794726ad5ec367598022cd005cdab978 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 16 八月 2024 17:42:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
index 2bf8d35..0c63199 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
@@ -63,16 +63,16 @@
         return AjaxResult.ok(res);
     }
     /**
-     * 选择车辆列表
+     * 选择车辆列表 远程调用
      * @return
      */
     @ApiOperation(value = "选择车辆列表", tags = {"小程序-扫一扫"})
     @PostMapping(value = "/scan/carList")
-    public AjaxResult<List<TAppUserCar>> carList() {
+    public R<List<TAppUserCar>> carList() {
         // todo 用户id
         List<TAppUserCar> appUserId = appUserCarService.list(new QueryWrapper<TAppUserCar>()
-                .eq("app_user_id",tokenService.getLoginUserApplet().getUserid() ));
-        return AjaxResult.ok(appUserId);
+                .eq("app_user_id",tokenService.getLoginUserApplet().getUserid()));
+        return R.ok(appUserId);
     }
 
     /**

--
Gitblit v1.7.1