From d1590eb05ab3ab6036aca6791c4fec45bca4d453 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 10 十月 2018 15:33:35 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@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