Merge branch 'developer'

Helius

2022-03-04 ce6cc897ad5d817634b93937c34ce4a42a97be92

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/ScoreProductDto.java

@@ -13,6 +13,8 @@
    private Integer scoreCategoryId;


    @ApiModelProperty(value = "属性编码", example = "jfscrmtj")
    private String attrCode;


}