From bb5be7a8a6ac24fbf66f03f070751577b87c95ca Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 15 Apr 2021 17:56:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/app/dto/ServiceVipProjDto.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceVipProjDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceVipProjDto.java
index 24ae2a3..7201321 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceVipProjDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceVipProjDto.java
@@ -19,7 +19,7 @@
@ApiModelProperty(value = "查询参数")
private String queryKey;
- @ApiModelProperty(value = "类型 0-全部 1-有效 2-无效 3-一个月内过期")
+ @ApiModelProperty(value = "类型 0-全部 1-有效 3-无效 2-一个月内过期")
private String type;
public Long getVipId() {
--
Gitblit v1.9.1