Merge remote-tracking branch 'origin/master'

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/AssObuSupplyManagerImpl.java

@@ -193,8 +193,10 @@ public class AssObuSupplyManagerImpl extends AbstractIawManager implements AssOb
     }
 
     private VehicleInfoQueryDeviceModel validVehicleInfo(QtkVehicleInfo vehicleInfo, AssObuSupplyApplyRequestDTO dto) throws ManagerException {
-        if (!dto.getOwnerName().equals(vehicleInfo.getOwnerName())){
-            throw new ManagerException("行驶证所有人与车辆所有不一致！");
+        if (!StringUtils.isEmpty(vehicleInfo.getOwnerName())){
+            if (!dto.getOwnerName().equals(vehicleInfo.getOwnerName())){
+                throw new ManagerException("行驶证所有人与车辆所有不一致！");
+            }
         }
         if (vehicleInfo.getType() > 10 && vehicleInfo.getType() <= 20){
             if (StringUtils.isEmpty(dto.getVehHeadUrl())){

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/AssOrderAuditManager.java

@@ -97,7 +97,7 @@ public class AssOrderAuditManager extends AbstractAssManager<AssOrderAuditReques
                 case CANCEL://设备注销
                     deviceCancelAuditManager.serviceHandle(request, order);
                     break;
-                case OBU_SUPPLY://设备注销
+                case OBU_SUPPLY://增补OBU
                     obuSupplyReviewManager.serviceHandle(request, order, staff);
                 //TODO
                 default: