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

maven

3 天以前 0ce689b428cf9ceb58972db2bdd42a1a176f8f20

 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;