Merge branch 'staff-upd-vehicle-File' into dev

# Conflicts:
#	xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/impl/UploadZipServiceImpl.java
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

xx-common/xx-common-platform/pom.xml

@@ -26,6 +26,12 @@
             <groupId>com.github.wxiaoqi</groupId>
             <artifactId>ace-common</artifactId>
             <version>2.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-io</artifactId>
+                    <groupId>commons-io</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>javax.persistence</groupId>

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

@@ -91,7 +91,7 @@ public class UploadZipServiceImpl implements UploadZipService {
                 if (PHOTO_FORMAT.contains(format)) {
                     String realFileRelPath = dirPathToday + File.separator + no +format;
                     File targetFile = new File(uploadPath+File.separator+realFileRelPath);
-               FileUtils.copyInputStreamToFile(zipFile.getInputStream(entry),targetFile);
+                    FileUtils.copyInputStreamToFile(zipFile.getInputStream(entry),targetFile);
                     realFileRelPath=xx_url+ SystemConfig.RENOVATE+File.separator+realFileRelPath;
                     result.append(realFileRelPath+",");
                 }