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

chenlu

2024-03-15 e7b89d449afc3912c21a64d59bafd7737f7376fd

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

@@ -36,11 +36,11 @@
    //本工序
    private String thisProcess;
    //上工序数量
    private Integer thisProcessQuantity;
    private int thisProcessQuantity;
    //本工序完工数量
    private Integer thisCompletedQuantity;
    private int thisCompletedQuantity;
    //本工序次破数量
    private Integer thisWornQuantity;
    private int thisWornQuantity;
    //下工序
    private String nextProcess;
    //班次