Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs

whycq

2024-05-29 265483cb46b5e951e3f6f9b6ed4ecdc94e6b371d

 src/main/java/com/zy/common/entity/MatExcel.java

@@ -14,10 +14,10 @@
@ExcelIgnoreUnannotated
public class MatExcel extends Mat {

    @ExcelProperty(index = 0, value = "一级分类")
    @ExcelProperty(value = "一级分类")
    private String priClass;

    @ExcelProperty(index = 1, value = "二级分类")
    @ExcelProperty(value = "存货大类编码")
    private String secClass;

}