Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-04-16 949e7e46086e034d747746d2b450d7c262c9a594

 zq-erp/src/main/java/com/matrix/system/app/dto/ShoppingGoodsListDto.java

@@ -32,6 +32,17 @@
    @ApiModelProperty(hidden = true)
    private Long shopId;

    @ApiModelProperty(hidden = true)
    private Long companyId;

    public Long getCompanyId() {
        return companyId;
    }

    public void setCompanyId(Long companyId) {
        this.companyId = companyId;
    }

    public String getGoodType() {
        return goodType;
    }