Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into dat...

wzy

2021-07-10 3954537f11c1c6fbfc62a6233102c530e3202ba1

 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;
    }