Merge remote-tracking branch 'origin/master'

zhoushihao

2024-05-16 df5a46acb9a169c29692ed8b8d1e712fbec65e81

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/OptimizeUpPattenUsage.java

@@ -40,7 +40,7 @@
    /**
     * 原片版图片序
     */
    private Integer heatLayoutSort;
    private Integer stockId;

    /**
     * 状态