Merge remote-tracking branch 'origin/master'

mitao

2 天以前 f769d817f8ba2522147c73fa93ccacdc3aab0cb6

 ruoyi-system/src/main/java/com/ruoyi/system/vo/AssetStatisticsDetailVO.java

@@ -17,6 +17,8 @@
    private Integer type;
    @ApiModelProperty(value = "资产名称")
    private String assetName;
    @ApiModelProperty(value = "资产编码")
    private String assetCode;
    @ApiModelProperty(value = "规格型号")
    private String specificationModel;
    @ApiModelProperty(value = "资产类型")