Merge remote-tracking branch 'origin/master'

Lius

2024-07-25 854856127101ea6cbbc261db46cb06ac141d6ab0

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceOrderActualMaterial.java

@@ -61,7 +61,6 @@
   /**删除状态(0-正常,1-已删除)*/
   @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
    @TableLogic
    private Integer delFlag = CommonConstant.DEL_FLAG_0;
   /**备注*/
   @Excel(name = "备注", width = 15)