Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-12 c18037dc5de7f67175c2cf80cd04761d198739b5

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