Merge branch 'dev/dev' into dev/dev_xp

# Conflicts: # src/main/java/com/ai/da/python/vo/DesignPythonItem.java
2024-05-13 14:30:15 +08:00
parent f23f4133d0 7b83f42ed8
commit 718198bcfe
5 changed files with 14 additions and 7 deletions
--- a/src/main/java/com/ai/da/model/dto/CollectionColorDTO.java
+++ b/src/main/java/com/ai/da/model/dto/CollectionColorDTO.java
@@ -28,7 +28,7 @@ public class CollectionColorDTO {

    private Gradient gradient;

-//    private String gradientString;
+    private String gradientString;

    private String gradientMinioUrl;