Merge remote-tracking branch 'origin/master' into pim_yys

maven

3 天以前 0ce689b428cf9ceb58972db2bdd42a1a176f8f20

 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;