Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

Helius

2021-01-26 6c1d7e07b794cb54aaafa371372283e0c989e0d2

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

@@ -22,6 +22,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 Long getShopId() {
        return shopId;
    }