From c0c209883be96edb2e463a30f862884facb3db3a Mon Sep 17 00:00:00 2001
From: Aokiso <1010390029@qq.com>
Date: Wed, 9 Jan 2019 08:41:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/bean/UsageDate.java    | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/demo/src/main/java/com/example/demo/bean/UsageDate.java b/demo/src/main/java/com/example/demo/bean/UsageDate.java
index aadfb24..f80ac79 100644
--- a/demo/src/main/java/com/example/demo/bean/UsageDate.java
+++ b/demo/src/main/java/com/example/demo/bean/UsageDate.java
@@ -26,7 +26,6 @@ public class UsageDate {
     public UsageDate(){}
     private int equation;
 
-<<<<<<< HEAD
     public int getYear() {
         return 0;
     }
@@ -35,27 +34,16 @@ public class UsageDate {
         return 0;
     }
 
-    public double getAmount() {
-=======
     public double getAmount() {
         return amount;
     }
 
-    public int getYear() {
-        return year;
-    }
-
-    public long getProductNum() {
->>>>>>> origin/master
-        return 0;
-    }
-
     public long getUserNum() {
-        return 0;
+        return userNum;
     }
 
     public int getBankNum() {
-        return 0;
+        return bankNum;
     }
 
 }