Merge branch 'dev/dev_xp' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/model/dto/ToProductImageDTO.java

src/main/java/com/ai/da/mapper/primary/entity/ToProductImageResult.java

@@ -20,6 +20,11 @@ public class ToProductImageResult implements Serializable {
     @ApiModelProperty(value = "elementId")
     private Long elementId;
 
+    /**
+     * 取值类型： DesignOutfit 以design的结果作为图片来源
+     * ProductElement 上传的图片
+     * ToProductImage 以to product image的结果作为图片来源(relight)
+     */
     @ApiModelProperty(value = "elementType")
     private String elementType;
 
@@ -53,4 +58,6 @@ public class ToProductImageResult implements Serializable {
     private Long projectId;
 
     private String taskIdBatch;
+
+    private String modelName;
 }