Merge remote-tracking branch 'origin/huji'

src/main/java/com/ads/business/service/impl/FileServiceImpl.java

@@ -23,6 +23,7 @@ public class FileServiceImpl implements FileService {
         Path storePath = Paths.get(pictureConfig.getBasePath(), pictureConfig.getUploadPath(), pictureConfig.getSourceBasePath(), pictureName);
         // 上传文件的显示路径
         String serverPath = new StringBuilder(pictureConfig.getServerBasePath()).append("/").append(pictureConfig.getUploadPath()).append("/")
+                .append(pictureConfig.getSourceBasePath()).append("/")
                 .append(pictureName).toString();
         return new GetPicturePathOutData(serverPath, storePath);
     }