Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

yuan

21 小时以前 fb40c4dfec5954c321f38bb86e9d07eb87b97bfd

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

@@ -66,4 +66,7 @@

    @ApiModelProperty("创建人名称")
    private String createUserName;

    @ApiModelProperty("备注")
    private String Remark;
}