Resolved conflicts
This commit is contained in:
@@ -278,6 +278,9 @@ public class CompanyDocumentDao {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
URL amazonS3Url = amazonS3.getUrl(bucketName, newS3Path);
|
||||||
|
String fileUrl = amazonS3Url.toString();
|
||||||
|
|
||||||
DocumentEntity entity = new DocumentEntity();
|
DocumentEntity entity = new DocumentEntity();
|
||||||
entity.setFilePath(response.getFilePath());
|
entity.setFilePath(response.getFilePath());
|
||||||
entity.setFileName(response.getFileName());
|
entity.setFileName(response.getFileName());
|
||||||
|
|||||||
Reference in New Issue
Block a user