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

guoyuji

2024-10-18 eef4b7ca66cc2fb34d2d2cb0a4a8643f2bb0f838

 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("完工数量")