Merge branch 'dev/dev' into dev/dev_xp

# Conflicts:
#	src/main/java/com/ai/da/python/vo/DesignPythonItem.java

src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java

@@ -360,6 +360,7 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
             String gradientMinioUrl = minioUtil.uploadImageFromBase64(gradientBucketName, base64Data, imageType);
             colorBoard.setGradientMinioUrl(gradientMinioUrl);
             colorBoard.getGradient().setColorImg(null);
+            colorBoard.setGradientString(JSON.toJSONString(colorBoard.getGradient()));
         }
         elementVO.setColorBoards(colorBoards);
         List<Long> usedElementIds = elementVO.getUsedElementIds();