Merge remote-tracking branch 'origin/master'

mitao

9 小时以前 95d8e5f4348497b1eee5884086534c86b1661b4f

 ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetRepairRecordDetailVO.java

@@ -61,6 +61,9 @@
    @ApiModelProperty(value = "关联报修单ID")
    private Integer repairRequestId;

    @ApiModelProperty(value = "关联报修单编号")
    private String repairRequestNo;

    @ApiModelProperty(value = "维修资产列表")
    private List<AssetRepairRecordAssetVO> assetList;