From a6b4c1e19b3b3fdcf80d7f69f20fe406205fcf8f Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期一, 26 十一月 2018 11:54:39 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/dto/Batttestdatastop.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java b/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java
index 7d98060..2cd0157 100644
--- a/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java
+++ b/gx_tieta/src/com/fgkj/dto/Batttestdatastop.java
@@ -206,6 +206,7 @@
 	public void setNote(String note) {
 		this.note = note;
 	}
+    
 
 	@Override
 	public String toString() {
@@ -226,6 +227,8 @@
 	
 
 	
+
+	
 	
 
 	

--
Gitblit v1.9.1