Merge remote-tracking branch 'origin/master'

extend/service/CarInfoHandle.php

@@ -479,8 +479,8 @@ class CarInfoHandle
                 $car_info->car_no = $car_no != '' ? $car_no : $car_info->car_no;
                 $car_info->car_man = $car_info->car_man != '' ? $car_info->car_man : $car_man;
                 $car_info->car_number = $car_info->car_number != '' ? $car_info->car_number : $car_number;
-                $car_info->register_date = $register_date;
-                $car_info->factory_model = $factory_model;
+                $car_info->register_date = $register_date ?: $car_info->register_date;
+                $car_info->factory_model = $factory_model ?: $car_info->factory_model;
                 //对比原信息是否包含待更新信息(删除星号)
                 $car_info->engine_no = $car_info->engine_no != '' && startsWith($car_info->engine_no, rtrim($engine_no, '*')) ? $car_info->engine_no : $engine_no;
                 $insurer1_flag = strtotime(date('Y', strtotime($insurer1_date))) > strtotime(date('Y', strtotime($car_info->insurer1_date)));