Merge branch 'release/3.0' into dev/dev_xp

# Conflicts:
#	src/main/java/com/ai/da/mapper/primary/DesignMapper.java
#	src/main/resources/mapper/primary/DesignMapper.xml
This commit is contained in:
2024-03-06 21:00:07 +08:00
8 changed files with 104 additions and 6 deletions

View File

@@ -2919,6 +2919,7 @@ public class PythonService {
Boolean result = JSON.parseObject(JSON.toJSONString(response)).getBoolean("successful");
if (result && jsonObject.get("code").equals(200)) {
log.info("Generate##responseObject###{}", jsonObject);
return setGenerateImageList(jsonObject.getJSONObject("data"));
}
log.info("generateSketchOrPrintPrint失败###{}", jsonObject);