Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/WalletCathDetailVo.java

@@ -52,4 +52,6 @@ public class WalletCathDetailVo {
 
     @ApiModelProperty(value = "到账金额")
     private BigDecimal realAmount;
+
+    private String accountName;
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRentVehicleController.java

@@ -75,7 +75,7 @@ public class OrderRentVehicleController extends CommonBaseController {
                 bo.setAppUserDTO(userFeign.userDetailById(dto.getAppUserId()).getData());
                 bo.setCrtUser("-1"+ BaseContextHandler.getUserID());
                 //设置-1表示查询所有的车
-                bo.setUseType(-1);
+                //bo.setUseType(-1);
                 orderRentVehicleService.createOrder(bo);
                 return ObjectRestResponse.succ(bo.getOrder());
         }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java

@@ -142,7 +142,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         }
         //设置显示是否有车
         dto.setYearNo4Where(Boolean.TRUE);
-        dto.setUseType(null);
+        //dto.setUseType(null);
         return ObjectRestResponse.succ(vehicleBiz.searchUsableModelBackStage(dto));
     }