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

guoyuji

2024-03-13 d8085c81987d5819d7f270bcf0bd68d879f28d2b

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

@@ -55,7 +55,7 @@
    //备注
    private String notes;
    //质检员
    private String qualityInsPector;
    private String qualityInspector;
    //包装方式
    private String packagingMethod;
    //报工时间