Merge remote-tracking branch 'origin/dev/dev' into dev/dev

src/main/java/com/ai/da/model/dto/AlipayHKCallbackDTO.java

@@ -0,0 +1,30 @@
+package com.ai.da.model.dto;
+
+import lombok.Data;
+
+@Data
+public class AlipayHKCallbackDTO {
+
+    private String transaction_id;
+
+    private Long amount;
+
+    private String currency;
+
+    private String payment_time;
+
+    private String merchant_id;
+
+    private String segment_id;
+
+    private String out_trade_no;
+
+    private String type;
+
+    private String status;
+
+    private String pid;
+
+    private String subject;
+
+}

src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java

@@ -44,7 +44,7 @@ public class DesignSingleItemDTO implements Serializable {
     private List<Long> offset;
 
     @ApiModelProperty("图层缩放比例")
-    private Float scale;
+    private Float[] scale;
 
     @NotNull(message = "priority.cannot.be.empty")
     @ApiModelProperty("图层优先级")

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

@@ -23,7 +23,7 @@ public class DesignPythonOutfitVO {
     private String imageCategory;
 
     /**
-     * 图层大小
+     * 图层大小(前后片大小)
      */
     @ApiModelProperty(value = "图层大小")
     private List<Long> imageSize;
@@ -55,7 +55,7 @@ public class DesignPythonOutfitVO {
      * 图层缩放比例
      */
     @ApiModelProperty(value = "缩放比例")
-    private Float scale = 1.0f;
+    private Float[] scale = new Float[]{1.0f,1.0f};
     /**
      * 图层优先级 从10开始，优先级数字越大越靠近上层
      */