Merge branch 'dev_tide' into dev_tide_gybjyhglxt

zouyu

4 天以前 0b0b8419586505154a7e57e7c32c9a44329347ce

 src/main/java/com/ruoyi/device/pojo/DeviceRepair.java

@@ -25,6 +25,10 @@
    @ApiModelProperty("设备台账id")
    private Long deviceLedgerId;

    private String deviceName;

    private String deviceModel;

    @ApiModelProperty("报修时间")
    private Date repairTime;