Merge remote-tracking branch 'origin/develop' into dev_shb

# Conflicts:
#	src/main/java/com/ai/da/mapper/entity/SysFile.java

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

@@ -6,7 +6,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 
 @Data
-public class DesignSingleItemDTO {
+public class  DesignSingleItemDTO {
 
     @NotBlank(message = "id cannot be empty!")
     @ApiModelProperty("切换图片对应的id")
@@ -16,10 +16,10 @@ public class DesignSingleItemDTO {
     @ApiModelProperty("生成item实际对应的类型 有:outwear,dress,blouse,skirt,trousers Shoes Hairstyle Earring")
     private String type;
 
-    @NotBlank(message = "path cannot be empty!")
-    @ApiModelProperty("对应的图片的绝对路径")
+    @ApiModelProperty("对应的图片的minIO路径")
     private String path;
 
+    @NotBlank(message = "color cannot be empty!")
     @ApiModelProperty("颜色 存 RGB值 中间空格分隔 比如 \"58 58 169\"")
     private String color;
 

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

@@ -11,8 +11,8 @@ import java.util.List;
 @ApiModel("design single 印花请求信息")
 public class DesignSinglePrintDTO {
 
-    @ApiModelProperty("印花url")
-    private String path;
+//    @ApiModelProperty("印花url")
+//    private String path;
 
     @ApiModelProperty("single -> true,overall -> false")
     private Boolean ifSingle;
@@ -20,4 +20,6 @@ public class DesignSinglePrintDTO {
     @ApiModelProperty("印花详细")
     private List<DesignSinglePrint> prints;
 
+    public DesignSinglePrintDTO() {
+    }
 }