Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-09-26 4484de8a9af2b94b76ea31eb48e3393bfe1314b0

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java

@@ -116,6 +116,8 @@
                .eq("app_user_id",tokenService.getLoginUserApplet().getUserId())
                .orderByDesc("create_time"));
        Long data1 = chargingOrderClient.getCar().getData();
        Integer data2 = otherClient.getAddCarIntegral().getData();
        data.setIntegral(data2);
        if (!cars.isEmpty()){
            if (data1 == -1){
                // 没有充电订单 展示最新添加的车辆