Merge remote-tracking branch 'origin/master'

zss

2 天以前 aab9f74b97df038154d507b6d17b6f96a8337efc

 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;