Merge remote-tracking branch 'origin/master' into pim-qiao

青城

10 天以前 5c5fc86ebb905d5c0d09caef3d80f38b2aba6f18

 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;