Merge branch 'dev/dev_xp' into dev/dev

# Conflicts: # src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetailPrint.java # src/main/java/com/ai/da/model/vo/DesignSinglePrint.java # src/main/java/com/ai/da/python/PythonService.java # src/main/java/com/ai/da/python/vo/DesignPythonItemElement.java # src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java # src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
2025-02-10 11:21:52 +08:00
parent aadb717c9f ab7e1705c4
commit 521bd5071a
7 changed files with 27 additions and 25 deletions
--- a/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetailPrint.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetailPrint.java
@@ -41,7 +41,7 @@ public class DesignItemDetailPrint {
    /**
     * 印花缩放比例
     */
-    private Double[] scale;
+    private String scale;
    /**
     * 印花旋转角度
     */