Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-03-15 3c87c3ff67c2193ab5bfaa31f0fb1ad5a68cd5af

 north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java

@@ -31,7 +31,7 @@
    //已优化数量
    private Integer optimizeQuantity;
    //排版状态
    private Integer layoutStatus;
    private String layoutStatus;
    //补片数量
    private Integer numberPatches;
    //库存数量