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

Merge branch 'release/3.0' into dev/dev_xp

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/python/PythonService.java
#	src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
This commit is contained in:
xupei
2024-06-11 15:23:24 +08:00
parent 954f6207ec 775ae3266c
commit 77f514a03b
15 changed files with 74 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/ai/da/python/vo/DesignPythonItem.java
View File

@@ -28,9 +28,9 @@ public class DesignPythonItem {
*/
private String color;
private String gradient;
// private String gradient;
private String gradientString;
// private String gradientString;
/**
* 对应的print图片的绝对路径
@@ -114,7 +114,7 @@ public class DesignPythonItem {
}
public DesignPythonItem(String type, String path, String color, DesignPythonItemPrint print, Long businessId,
Long image_id, List<Long> offset, Float[] resize_scale, Integer priority, String gradient, String gradientString) {
Long image_id, List<Long> offset, Float[] resize_scale, Integer priority) {
this.type = type;
this.path = path;
this.color = color;
@@ -125,8 +125,8 @@ public class DesignPythonItem {
this.offset = offset;
this.resize_scale = resize_scale;
this.priority = priority;
this.gradient = gradient;
this.gradientString = gradientString;
// this.gradient = gradient;
// this.gradientString = gradientString;
}
public DesignPythonItem(String type, String path, String color, DesignPythonItemPrint print, String icon, Long businessId, Long image_id) {