From 18d1f4bc4f4f77c8883702a00896dd99469db648 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 八月 2023 16:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java b/java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java
index 64931bd..1719840 100755
--- a/java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java
@@ -1,8 +1,7 @@
package com.java110.dto.fee;
import com.java110.dto.PageDto;
-import com.java110.dto.feeAccountDetail.FeeAccountDetailDto;
-import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
+import com.java110.dto.payFee.PayFeeDetailDiscountDto;
import java.io.Serializable;
import java.util.Date;
@@ -29,7 +28,7 @@
public static final String STATE_RETURN_ERROR = "1200";
public static final String STATE_RETURN_ORDER = "1300";
public static final String STATE_NORMAL = "1400";
-
+ public static final String STATE_OWE = "1500"; // 娆犺垂
/**
* 1000 閫�璐逛腑
* 1100 宸查��璐�
@@ -85,6 +84,8 @@
private String amount;
private String primeRateName;
+
+ private String feeFlag;
public String getPrimeRate() {
return primeRate;
@@ -397,4 +398,12 @@
public void setCashierName(String cashierName) {
this.cashierName = cashierName;
}
+
+ public String getFeeFlag() {
+ return feeFlag;
+ }
+
+ public void setFeeFlag(String feeFlag) {
+ this.feeFlag = feeFlag;
+ }
}
--
Gitblit v1.8.0