From 2a0298bb6ce4584ba311d7eba8454f515d2b0b3c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 31 一月 2024 15:42:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CarController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 ad111ec..5bee7d7 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
@@ -113,18 +113,21 @@
@ApiImplicitParam(value = "保险照片", name = "insurancePhoto", required = false, dataType = "string"),
@ApiImplicitParam(value = "保险到期时间(yyyy-MM-dd)", name = "commercialInsuranceTime", required = false, dataType = "string"),
@ApiImplicitParam(value = "人车合影照片", name = "peopleAndCarsPhone", required = false, dataType = "string"),
+ @ApiImplicitParam(value = "其他品牌", name = "otherBrand", required = false, dataType = "string"),
+ @ApiImplicitParam(value = "其他型号", name = "otherModel", required = false, dataType = "string"),
+// @ApiImplicitParam(value = "其他颜色", name = "otherColor", 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 drivingLicenseNumber, String drivingLicensePhoto,
String drivingLicenseEndTime, String carPhoto, String insurancePhoto, String commercialInsuranceTime,
- String peopleAndCarsPhone, HttpServletRequest request,Integer id, Integer language){
+ String peopleAndCarsPhone, HttpServletRequest request,Integer id, Integer language,String otherBrand,String otherModel){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
return carService.addCar(modelId, color, licensePlate, time, drivingLicenseNumber, drivingLicensePhoto, drivingLicenseEndTime, carPhoto, insurancePhoto
- , commercialInsuranceTime, uid,id, peopleAndCarsPhone, language);
+ , commercialInsuranceTime, uid,id, peopleAndCarsPhone, language,otherBrand,otherModel);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
--
Gitblit v1.7.1