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

liyong

3 天以前 700e40694345fec652d7dca688912c36af18e1ae

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

@@ -19,6 +19,10 @@
    @Excel(name = "设备型号")
    private String deviceModel;

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

    @Schema(description = "报修时间")
    @Excel(name = "报修时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date repairTime;