Merge remote-tracking branch 'origin/master'

无关风月

10 小时以前 92ff484325b9af3afd081ec079f74fbc6dd3fea8

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

@@ -62,7 +62,7 @@
    private Integer repairRequestId;

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

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