From 992f5853fb625be015fa28e9a0154278b2ed41a2 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 26 Jan 2021 16:54:18 +0800 Subject: [PATCH] Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api --- zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java index 4a405f6..1c0a500 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java +++ b/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java @@ -13,8 +13,9 @@ @ApiModelProperty(value = "查询参数") private String queryKey; - @ApiModelProperty(value = "状态 0/全部 1/待确认 2/待排班 3/待配料 4/待服务 5/服务中 6/已完成") + @ApiModelProperty(value = "状态 0/全部 1/待确认 2/待排班 3/待配料 4/待服务 5/服务中 6/已完成 ") private String status; + @ApiModelProperty(hidden = true) private Long shopId; @@ -22,6 +23,18 @@ @ApiModelProperty(hidden = true) private Long userId; + @ApiModelProperty(value = "客户ID") + private Long vipId; + + + public Long getVipId() { + return vipId; + } + + public void setVipId(Long vipId) { + this.vipId = vipId; + } + public Long getUserId() { return userId; } -- Gitblit v1.9.1