Merge branch 'dev/dev' into dev/dev_xp

# Conflicts:
#	pom.xml

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

@@ -5,10 +5,11 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.util.List;
 
 @Data
-public class DesignSingleIncludeLayersDTO {
+public class DesignSingleIncludeLayersDTO implements Serializable {
 
     @ApiModelProperty("designItemId")
     @NotNull(message = "designItemId.cannot.be.empty")

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

@@ -7,10 +7,11 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.util.List;
 
 @Data
-public class DesignSingleItemDTO {
+public class DesignSingleItemDTO implements Serializable {
 
     @NotNull(message = "id.cannot.be.empty")
     @ApiModelProperty("切换图片对应的id")

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

@@ -5,11 +5,12 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 @Data
 @ApiModel("design single 印花请求信息")
-public class DesignSinglePrintDTO {
+public class DesignSinglePrintDTO implements Serializable {
 
 //    @ApiModelProperty("印花url")
 //    private String path;

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

@@ -6,11 +6,12 @@ import lombok.Data;
 import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.Min;
+import java.io.Serializable;
 import java.util.List;
 
 @Data
 @ApiModel("design single 印花详情")
-public class DesignSinglePrint {
+public class DesignSinglePrint implements Serializable {
 
     @ApiModelProperty("印花是用户上传的还是从library中选的 collection/library")
     private String designType;