Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-08-22 9da523001f61c6c6e777594c3c95c14d249abad4

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

@@ -25,10 +25,10 @@
    private String width;
    @ExcelProperty("高")
    private String height;
    @ExcelProperty("形状")
    private String shape;
    @ExcelProperty("厚度")
    private String thickness;
//    @ExcelProperty("形状")
//    private String shape;
//    @ExcelProperty("厚度")
//    private String thickness;
    @ExcelProperty("磨边类型")
    private String edgingType;
    @ExcelProperty("完工数量")