Merge branch 'dev/dev_xp' into dev/3.1_release_merge

This commit is contained in:
2026-02-04 14:48:38 +08:00

View File

@@ -2852,12 +2852,8 @@ public class PythonService {
} }
PrintToPython printToPython; PrintToPython printToPython;
if (designSingleIncludeLayersDTO.getDesignType().equals("default")){ printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints(),
printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints(), designSingleItem.getPartialDesign().getPartialDesignMinioPath());
designSingleItem.getPartialDesign().getPartialDesignMinioPath());
} else {
printToPython = null;
}
/*PrintToPython printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints(), /*PrintToPython printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints(),
designSingleItem.getPartialDesign().getPartialDesignMinioPath());*/ designSingleItem.getPartialDesign().getPartialDesignMinioPath());*/
// resolveDesignElement(designSingleItem.getTrims(), printToPython); // resolveDesignElement(designSingleItem.getTrims(), printToPython);