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

maven

9 天以前 b1b59aac99c3d465d51e5fb4f7ab8185ddb733d2

 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;