From cf487b4baf05048e8929b47d73efc83d6a09162c Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 30 一月 2024 17:12:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CarController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CarController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CarController.java
index 433ccbd..ad111ec 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CarController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CarController.java
@@ -106,6 +106,7 @@
@ApiImplicitParam(value = "车辆颜色", name = "color", required = true, dataType = "string"),
@ApiImplicitParam(value = "车牌号", name = "licensePlate", required = true, dataType = "string"),
@ApiImplicitParam(value = "年审日期（需要格式化）", name = "time", required = false, dataType = "string"),
+ @ApiImplicitParam(value = "行驶证号", name = "drivingLicenseNumber", required = true, dataType = "string"),
@ApiImplicitParam(value = "行驶证照片", name = "drivingLicensePhoto", required = true, dataType = "string"),
@ApiImplicitParam(value = "行驶证到期时间(yyyy-MM-dd)", name = "drivingLicenseEndTime", required = true, dataType = "string"),
@ApiImplicitParam(value = "车辆照片", name = "carPhoto", required = true, dataType = "string"),
@@ -114,16 +115,16 @@
@ApiImplicitParam(value = "人车合影照片", name = "peopleAndCarsPhone", required = false, dataType = "string"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = false, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil addCar(Integer modelId, String color, String licensePlate, Date time, String drivingLicensePhoto,
+ public ResultUtil addCar(Integer modelId, String color, String licensePlate, Date time, String drivingLicenseNumber, String drivingLicensePhoto,
String drivingLicenseEndTime, String carPhoto, String insurancePhoto, String commercialInsuranceTime,
- String peopleAndCarsPhone, HttpServletRequest request,Integer id){
+ String peopleAndCarsPhone, HttpServletRequest request,Integer id, Integer language){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- return carService.addCar(modelId, color, licensePlate, time, drivingLicensePhoto, drivingLicenseEndTime, carPhoto, insurancePhoto
- , commercialInsuranceTime, uid,id, peopleAndCarsPhone);
+ return carService.addCar(modelId, color, licensePlate, time, drivingLicenseNumber, drivingLicensePhoto, drivingLicenseEndTime, carPhoto, insurancePhoto
+ , commercialInsuranceTime, uid,id, peopleAndCarsPhone, language);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
--
Gitblit v1.7.1