Merge remote-tracking branch 'origin/master'

无关风月

5 天以前 72faad1ea54670b640c172e3f7efe49f698cf420

 manage/src/main/java/com/jilongda/manage/vo/TModelVO.java

@@ -17,4 +17,6 @@
    private String brandName;
    @ApiModelProperty(value = "供应商")
    private String supplierName;
    @ApiModelProperty(value = "材质")
    private String materialName;
}