Merge branch 'master-captcha-branch' into dev

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/ClickWordCaptcha.java

@@ -29,7 +29,6 @@ public class ClickWordCaptcha extends AbstractCaptcha {
 
     private static int HAN_ZI_SIZE_HALF = 60;
 
-
     @Override
     public ClickWordCaptchaVO create(CaptchaBaseParam captchaParam) {
         if (captchaParam == null
@@ -91,7 +90,7 @@ public class ClickWordCaptcha extends AbstractCaptcha {
             Point point = randomWordPoint(900, 478, i, wordCount);
 
             //随机字体颜色
-            if (isFontColorRandom()){
+            if (true){
                 backgroundGraphics.setColor(new Color(RandomUtils.getRandomInt(1,255),RandomUtils.getRandomInt(1,255),RandomUtils.getRandomInt(1,255)));
             } else {
                 backgroundGraphics.setColor(Color.BLACK);

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

@@ -104,9 +104,9 @@ public class VehicleActiveService {
                 vehicleBookRecord = vehicleBookRecordBiz.selectById(departureVo.getBookRecordId());
                 updateBookRecordStatus(vehicleBookRecord, 1);
             }
-            if (vehicleBookRecord != null) {
-                vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
-            }
+//            if (vehicleBookRecord != null) {
+//                vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
+//            }
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
             VehicleDepartureLogVo vehicleDepartureLogVo = vehicleDepartureLogMapper.selectByBookRecordId(departureVo.getBookRecordId());
             if (vehicleDepartureLogVo != null) {

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

@@ -351,7 +351,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
             oldValue.setRetCompany(vehicleBookRecord.getRetCompany());
             BookRecordUpdateLog bookRecordUpdateLog = new BookRecordUpdateLog();
             bookRecordUpdateLog.setBookRecordId(vehicleBookRecord.getId());
-            bookRecordUpdateLog.setOldRetCompanyId(vehicleBookRecord.getRetCompany());
+            bookRecordUpdateLog.setOldRetCompanyId(oldValue.getRetCompany());
             bookRecordUpdateLog.setNewRetCompanyId(vehicleBookRecord.getRetCompany());
             bookRecordUpdateLog.setOperaterId(userDTO.getId());
             bookRecordUpdateLog.setOperaterName(userDTO.getName());