Merge remote-tracking branch 'origin/master'

maven

5 天以前 3ac8d43ba46808cfe2fb51111da2456fd02477e1

 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;