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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
shahaibo
2023-10-10 15:02:20 +08:00
parent e6a72b6a32 7bc0ddd068
commit b1d7df2d48
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/ai/da/python/PythonService.java
View File

@@ -1345,7 +1345,6 @@ public class PythonService {
designSingleItem.getPath(),
designSingleItem.getColor(),
resolveDesignSinglePrint(designSingleItem.getPrintObject(), designSingleItem.getPath()),
"none",
// todo businessId 待确认
designSingleItem.getId(),
pythonTAllInfoService.getImageIdByPath(designSingleItem.getPath()),

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

@@ -94,12 +94,12 @@ public class DesignPythonItem {
this.image_id = image_id;
}
public DesignPythonItem(String type, String path, String color, DesignPythonItemPrint print, String icon, Long businessId, Long image_id, List<Long> offset, Float resize_scale) {
public DesignPythonItem(String type, String path, String color, DesignPythonItemPrint print, Long businessId, Long image_id, List<Long> offset, Float resize_scale) {
this.type = type;
this.path = path;
this.color = color;
this.print = print;
this.icon = icon;
// this.icon = icon;
this.businessId = businessId;
this.image_id = image_id;
this.offset = offset;