Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

21 小时以前 2c2605a1297882bf88c3c86313ee37797854689b

 src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java

@@ -21,6 +21,10 @@
    @Schema(description = "规格型号")
    private String deviceModel;

    @Schema(description = "项目")
    @Excel(name = "项目")
    private String machineryCategory;

    @Excel(name = "计划保养日期", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
    @Schema(description = "计划保养日期")
    private Date maintenancePlanTime;