From ba9a621c55f520be8e26cdb0d3ad61b5246b2fc1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 07 Nov 2017 22:05:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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