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

whycq

2024-07-03 2ee70a38e4c832e3888b12d29ebf962456069cdb

 src/main/java/com/zy/asrs/entity/Mat.java

@@ -49,7 +49,8 @@
    /**
     * 编号
     */
    @ExcelIgnore
    // 导出借用该字段存所属归类中文描述
    @ExcelProperty(value = "归类名称")
    @ApiModelProperty(value= "编号")
    private String uuid;