From a23d395bb81f7ce64dfe9c18e1037d6c881f4f7d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 21 Jan 2021 11:56:51 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java | 8 ++++----
zq-erp/src/main/java/com/matrix/system/app/dto/ServiceVipProjDto.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
index 465715d..47aae8a 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
@@ -101,14 +101,14 @@
queryUse.setIsOver(Dictionary.FLAG_NO_N);
break;
case "2":
- queryUse.setStatus(Dictionary.TAOCAN_STATUS_WX);
- queryUse.setIsOver(Dictionary.FLAG_YES_Y);
- break;
- case "3":
queryUse.setTargetFailTime(DateUtil.getDateAfterMonth(new Date(), 1));
queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
queryUse.setIsOver(Dictionary.FLAG_NO_N);
break;
+ case "3":
+ queryUse.setStatus(Dictionary.TAOCAN_STATUS_WX);
+ queryUse.setIsOver(Dictionary.FLAG_YES_Y);
+ break;
default:
queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
queryUse.setIsOver(Dictionary.FLAG_NO_N);
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