Merge branch 'tiangong-v2.1.2' into tiangong-v2.2.0

uboot-common/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/ModelConvertor.java

@@ -127,7 +127,8 @@ public class ModelConvertor {
     public Optional<UploadObject> toUploadObject(String json) {
         return Optional.ofNullable(json).map(content -> {
             try {
-                return new UploadObject().setId(toUploadPO(json).getFileId());
+                SysStorageVO sysStorageVO = toUploadPO(json);
+                return new UploadObject().setId(sysStorageVO.getFileId()).setFilePath(sysStorageVO.getFilePath());
             } catch (JsonProcessingException e) {
                 log.error(json);
                 log.error(e.getMessage());

uboot-common/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/model/UploadObject.java

@@ -9,4 +9,5 @@ public class UploadObject {
 
     private String id;
 
+    private String filePath;
 }

uboot-common/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/vo/SysStorageVO.java

@@ -22,4 +22,7 @@ public class SysStorageVO {
     /* 文件唯一标识 */
     private String fileName;
 
+    /* 文件唯一标识 */
+    private String filePath;
+
 }