Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-15 bb5be7a8a6ac24fbf66f03f070751577b87c95ca

 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;


}