From e9285f6e48b26bdd494569e660006ec87f3ad66b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 31 十月 2019 14:00:43 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/dto/dataoke/DingDongTime.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dto/dataoke/DingDongTime.java b/fanli/src/main/java/com/yeshi/fanli/dto/dataoke/DingDongTime.java
index 2070288..57cf917 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dto/dataoke/DingDongTime.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dto/dataoke/DingDongTime.java
@@ -4,6 +4,17 @@
 	private String key;
 	private String value;
 	private String time;
+	private int state;//-1 褰撳墠鏃堕棿涔嬪墠  0:褰撳墠鏃堕棿  1褰撳墠鏃堕棿涔嬪悗
+
+
+
+	public int getState() {
+		return state;
+	}
+
+	public void setState(int state) {
+		this.state = state;
+	}
 
 	public String getTime() {
 		return time;
@@ -13,6 +24,12 @@
 		this.time = time;
 	}
 
+	public DingDongTime(String key, String value,int state) {
+		this.key = key;
+		this.value = value;
+		this.state= state;
+	}
+	
 	public DingDongTime(String key, String value) {
 		this.key = key;
 		this.value = value;

--
Gitblit v1.8.0