Merge remote-tracking branch 'origin/master'

无关风月

6 天以前 72faad1ea54670b640c172e3f7efe49f698cf420

 manage/src/main/java/com/jilongda/manage/dto/GetCurrentByParam.java

@@ -19,5 +19,7 @@
    private Integer brandId;
    @ApiModelProperty(value = "材质id")
    private Integer materialId;
    @ApiModelProperty(value = "门店id")
    private Integer storeId;

}