Merge remote-tracking branch 'origin/master'

maven

5 天以前 5323d2e4d07d5ceaaae6a5bf12254641a2d77174

 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;