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/mapper/primary/entity/CollectionElement.java

@@ -75,7 +75,7 @@ public class CollectionElement implements Serializable {
      */
     private String md5;
 
-    private String gradientString;
+//    private String gradientString;
 
     /**
      * 创建时间

src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetail.java

@@ -64,7 +64,7 @@ public class DesignItemDetail implements Serializable {
      */
     private String color;
 
-    private String gradientString;
+//    private String gradientString;
 
     /**
      * 对应的print图片的绝对路径