Merge remote-tracking branch 'origin/master'

xuhy

2024-12-27 525c120c93c2c25d8dfc59d4fac234b80b37d1c0

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

@@ -17,5 +17,7 @@
    private String color;
    @ApiModelProperty(value = "品牌id")
    private Integer brandId;
    @ApiModelProperty(value = "材质id")
    private Integer materialId;

}