From f99e01a5e62998ea3ccdd3e74c51bc6a0ca68bb9 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 02 一月 2019 17:39:10 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/services/Batt_Maint_DealarmService.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/services/Batt_Maint_DealarmService.java b/gx_tieta/src/com/fgkj/services/Batt_Maint_DealarmService.java
index 78371a6..695be6a 100644
--- a/gx_tieta/src/com/fgkj/services/Batt_Maint_DealarmService.java
+++ b/gx_tieta/src/com/fgkj/services/Batt_Maint_DealarmService.java
@@ -6,8 +6,6 @@
 import java.util.Date;
 import java.util.List;
 
-import sun.org.mozilla.javascript.internal.BaseFunction;
-
 import com.fgkj.actions.ActionUtil;
 import com.fgkj.dao.BaseDAO;
 import com.fgkj.dao.BaseDAOFactory;

--
Gitblit v1.9.1