Merge remote-tracking branch 'origin/master'

zss

昨天 118afd697fe3197236dcf0ffd6cfd39bcec2d85f

 src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java

@@ -16,7 +16,7 @@
    private Long id;

    @ApiModelProperty("设备台账id")
    private String deviceLedgerId;
    private Long deviceLedgerId;

    @ApiModelProperty("设备名称")
    private String deviceName;