Merge branch 'dev' into base-modify

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/VehicleModelController.java

@@ -10,6 +10,7 @@ import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.VModelDetailVO;
 import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import com.xxfc.platform.vehicle.pojo.VehicleModelVo;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
@@ -20,9 +21,10 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 
 @RestController
-@RequestMapping("/vehicleModel")
+@RequestMapping("/vehicleModel/app/unauth")
 @Slf4j
 @IgnoreClientToken
+@Api(tags = "房车车型", value = "房车车型")
 public class VehicleModelController extends CommonBaseController {
 
     @Autowired
@@ -50,7 +52,7 @@ public class VehicleModelController extends CommonBaseController {
      * @return
      */
     @ApiOperation("车型列表")
-    @PostMapping(value = "/app/unauth/findVehicleModelPage")
+    @PostMapping(value = "/findVehicleModelPage")
     @IgnoreUserToken
     public ObjectRestResponse<VehicleModelVo> findVehicleModelPageUnauthfind(@RequestBody VehicleModelQueryCondition vmqc) {
         return vehicleFeign.findVehicleModelPageUnauthfind(vmqc);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

@@ -81,7 +81,7 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
-        if(MileageLift==null||MileageLift1 >= MileageLift){
+        if(MileageLift == null || MileageLift1 >= MileageLift){
             // 写入车辆公里数,预计目的地
             vehicle.setMileageLastUpdate(MileageLift1);
             vehicle.setExpectDestinationBranchCompanyId(departureVo.getExpectArrivalBranchCompanyId());