Merge branch 'hive2.0' into score_shop

Helius

2021-04-06 1037ab6df799bd49c0f10adf1c048cd5ccc7e3e8

 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;


}