From 82c1e7ced425f43781b0cd01290fad298f51e623 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期六, 29 六月 2019 13:27:41 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of http://whyclj@118.89.139.230:10101/r/~whyclxw/sensor.git into dev_lxw

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

diff --git a/sensor/src/com/fgkj/dao/BaseDAO.java b/sensor/src/com/fgkj/dao/BaseDAO.java
index 2b9ed38..38af986 100644
--- a/sensor/src/com/fgkj/dao/BaseDAO.java
+++ b/sensor/src/com/fgkj/dao/BaseDAO.java
@@ -32,6 +32,8 @@
 	
 	public static final int  SERVER_STATE=13;
 	
+	public static final int  SENSOR_HISDATA=14;
+	
 	
 	public boolean add(Object obj); // 娣诲姞
 

--
Gitblit v1.9.1