From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/feeCollectionOrder/FeeCollectionOrderDto.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/feeCollectionOrder/FeeCollectionOrderDto.java b/java110-bean/src/main/java/com/java110/dto/feeCollectionOrder/FeeCollectionOrderDto.java
index d1c2e1b..c949b1a 100644
--- a/java110-bean/src/main/java/com/java110/dto/feeCollectionOrder/FeeCollectionOrderDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/feeCollectionOrder/FeeCollectionOrderDto.java
@@ -19,11 +19,12 @@
public static final String STATE_WAIT = "W";
public static final String STATE_DOING = "D";
public static final String STATE_FINISH = "F";
+ public static final String STATE_ERROR = "E";
//鍌即鏂瑰紡锛�001 浠呯煭淇℃柟寮� 002 鐭俊寰俊鏂瑰紡 003 浠呭井淇℃柟寮�
public static final String COLLECTION_WAY_SMS = "001";
- public static final String COLLECTION_WAY_WECHAT = "002";
- public static final String COLLECTION_WAY_WECHAT_SMS = "003";
+ public static final String COLLECTION_WAY_WECHAT_SMS = "002";
+ public static final String COLLECTION_WAY_WECHAT = "003";
private String orderId;
private String staffName;
@@ -31,7 +32,7 @@
private String communityId;
private String collectionWay;
private String staffId;
- private String remarks;
+ private String remark;
private String collectionName;
@@ -88,12 +89,12 @@
this.staffId = staffId;
}
- public String getRemarks() {
- return remarks;
+ public String getRemark() {
+ return remark;
}
- public void setRemarks(String remarks) {
- this.remarks = remarks;
+ public void setRemark(String remark) {
+ this.remark = remark;
}
public String getCollectionName() {
--
Gitblit v1.8.0