Merge branch 'release/3.0' into dev/dev_xp

# Conflicts:
#	src/main/java/com/ai/da/python/PythonService.java
#	src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java

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

@@ -26,10 +26,10 @@ public class CollectionColorDTO {
     @ApiModelProperty("潘通RGB值")
     private String rgbValue;
 
-    private Gradient gradient;
+//    private Gradient gradient;
+//
+//    private String gradientString;
 
-    private String gradientString;
-
-    private String gradientMinioUrl;
+//    private String gradientMinioUrl;
 
 }

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

@@ -50,8 +50,8 @@ public class DesignSingleItemDTO implements Serializable {
     @ApiModelProperty("图层优先级")
     private Integer priority;
 
-    @ApiModelProperty("渐变 颜色")
-    private Gradient gradient;
+//    @ApiModelProperty("渐变 颜色")
+//    private Gradient gradient;
 
     @ApiModelProperty("画笔修改过的sketch图片的base64格式的数据")
     private String sketchString;