Merge branch 'developer'

姜友瑶

2022-05-17 b63b60288025c131b7d6023d444417ab5b35e2c1

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