From b8e86e2b44b796ced6f8fa557dfee532749dcc6c Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Wed, 15 Nov 2017 17:25:02 +0800
Subject: [PATCH] Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git

---
 src/main/java/com/moral/monitor/dao/TaskDao.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/monitor/dao/TaskDao.java b/src/main/java/com/moral/monitor/dao/TaskDao.java
index 80b806d..4275d84 100644
--- a/src/main/java/com/moral/monitor/dao/TaskDao.java
+++ b/src/main/java/com/moral/monitor/dao/TaskDao.java
@@ -18,7 +18,7 @@
     public void insertTohistory(String mac, String sensor, String mac_key, String mac_value);
     //������state���
     public List<State> selectFromstate(String mac, String mac_key);
-    //������stata���
+    //������state���
     public void deleteFromstateBymacandmackey(String mac, String mac_key);
     //������state���
     public void insertTostate(String mac, String sensor, String mac_key, String mac_value);

--
Gitblit v1.8.0