aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/dev' into dev/dev_xp

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java
#	src/main/java/com/ai/da/python/vo/DesignPythonItem.java
This commit is contained in:
xupei
2024-05-10 17:25:06 +08:00
parent 6fa0ab30db fb29310ba1
commit f23f4133d0
13 changed files with 138 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/ai/da/model/dto/CollectionColorDTO.java
View File

@@ -1,5 +1,6 @@
package com.ai.da.model.dto;
import com.ai.da.mapper.primary.entity.Gradient;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -25,4 +26,10 @@ public class CollectionColorDTO {
@ApiModelProperty("潘通RGB值")
private String rgbValue;
private Gradient gradient;
// private String gradientString;
private String gradientMinioUrl;
}

1
src/main/java/com/ai/da/model/dto/CollectionSketchDTO.java
View File

@@ -1,5 +1,6 @@
package com.ai.da.model.dto;
import com.ai.da.mapper.primary.entity.Gradient;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

10
src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java
View File

@@ -48,9 +48,9 @@ public class DesignSingleItemDTO {
@ApiModelProperty("图层优先级")
private Integer priority;
// @ApiModelProperty("渐变 起始/目标 颜色")
// private List<List<Integer>> gradient;
//
// @ApiModelProperty("渐变角度")
// private Float gradient_angle;
@ApiModelProperty("渐变 起始/目标 颜色")
private String gradient;
@ApiModelProperty("渐变角度")
private Float gradient_angle;
}