Merge remote-tracking branch 'origin/master'

lyh

7 天以前 ce1cfcb9b9176ddb1f47c9eb4cb2232b080bdbf9

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java

@@ -8,6 +8,7 @@
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceSpare;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -50,7 +51,7 @@
    @ApiModelProperty(value = "保养日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date maintenanceDate;
    private String maintenanceDate;
    /**
     * 维修人
     */
@@ -101,6 +102,11 @@
     */
    @ApiModelProperty(value = "删除 保养项明细")
    private List<EamThirdMaintenanceOrderDetail> removeDetailList;
    /**
     * 备件明细
     */
    @ApiModelProperty(value = "备件使用明细")
    private List<EamThirdMaintenanceSpare> tableSpareList;

    /**
     * 操作人签字