Merge branch 'ty_fix' into alpha

Helius

2021-11-12 b70d988c7600d179aba0fabb6adf0dc7c461cb8a

 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;


}