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/model/dto/ToProductImageDTO.java

@@ -16,4 +16,5 @@ public class ToProductImageDTO {
     private Double brightenValue;
     private BigDecimal imageStrengthMin;
     private BigDecimal imageStrengthMax;
+    private String modelName;
 }

src/main/java/com/ai/da/model/vo/MagicToolResultVO.java

@@ -28,4 +28,8 @@ public class MagicToolResultVO {
     private String elementType;
 
     private Long elementId;
+
+    public MagicToolResultVO(String status) {
+        this.status = status;
+    }
 }