Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-06 abe25c659140b8c3f4db90ce943f4143a7d7f40f

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

@@ -26,6 +26,16 @@
    @ApiModelProperty(value = "客户ID")
    private Long vipId;

    @ApiModelProperty(hidden = true)
    private Long companyId;

    public Long getCompanyId() {
        return companyId;
    }

    public void setCompanyId(Long companyId) {
        this.companyId = companyId;
    }

    public Long getVipId() {
        return vipId;