Merge branch 'developer' into alpha

Helius

2022-03-10 6678c4c0f42d25e0a63416f4ac5dda3cd66627a7

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