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

guoyuji

2024-10-23 77c7984fb636f81a87208aea2bcffc701f6419e8

 north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java

@@ -7,6 +7,8 @@
public class WorkInProgressDTO {
    @ExcelProperty("工序")
    private String thisProcess;
    @ExcelProperty("销售单号")
    private String orderId;
    @ExcelProperty("流程卡号")
    private String processId;
    @ExcelProperty("客户名称")
@@ -37,4 +39,6 @@
    private String productName;
    @ExcelProperty("弯钢半径")
    private String bendRadius;
    @ExcelProperty("编号")
    private String glassNumber;
}