Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

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

@@ -16,6 +16,9 @@
    @ApiModelProperty(value = "门店ID", example = "34")
    private Long shopId;

    @ApiModelProperty(value = "会员ID")
    private Long staffId;

    public String getType() {
        return type;
    }
@@ -31,4 +34,12 @@
    public void setShopId(Long shopId) {
        this.shopId = shopId;
    }

    public Long getStaffId() {
        return staffId;
    }

    public void setStaffId(Long staffId) {
        this.staffId = staffId;
    }
}