Merge remote-tracking branch 'origin/master'

maven

5 天以前 5323d2e4d07d5ceaaae6a5bf12254641a2d77174

 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;