From 70c4207810e4348ad9c125c44cbb6842ecd8b4b7 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 28 Nov 2017 06:31:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/controller/ApiController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/ApiController.java b/src/main/java/com/moral/monitor/controller/ApiController.java
index 8d813d8..be0e022 100644
--- a/src/main/java/com/moral/monitor/controller/ApiController.java
+++ b/src/main/java/com/moral/monitor/controller/ApiController.java
@@ -527,7 +527,7 @@
try {
if(!StringUtils.isEmpty(areaName)) {
MonitorPointExample example = new MonitorPointExample();
- example.or().andTbAreaNameEqualTo(areaName);
+// example.or().andTbAreaNameEqualTo(areaName);
List<MonitorPoint> list = monitorpointService.queryListByExample(example);
if(list!=null&&list.size()>0) {
apiData.setErrno(0);
--
Gitblit v1.8.0