From 3f5f75f280b70a2d02f89aafbf22d8e5323e33f1 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期四, 27 九月 2018 15:02:42 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/dao/BaseDAO.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/BaseDAO.java b/gx_tieta/src/com/fgkj/dao/BaseDAO.java
index 317f591..a9691ce 100644
--- a/gx_tieta/src/com/fgkj/dao/BaseDAO.java
+++ b/gx_tieta/src/com/fgkj/dao/BaseDAO.java
@@ -176,6 +176,8 @@
 	
 	public static final int BATT_DEVALARM_DATA_HISTORY = 86;
 	
+	public static final int BATT_ENDURANCE=87;
+	
 	public boolean add(Object obj); // 娣诲姞
 
 	public boolean update(Object obj); // 鏇存柊

--
Gitblit v1.9.1