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

wzy

2021-04-24 1a20adbee4043a7b4a9e51565e7ac0f99d06c36d

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