Merge branch 'developer' into alpha

姜友瑶

2022-05-04 9fc4177dd26683f5dc6d8ebb62ab5b230ac21def

 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;


}