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("图层优先级")