From 951777654234cf9c03aa33e195eda05c1ec32c34 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.24>
Date: 星期三, 14 十一月 2018 13:42:30 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/control.jsp |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index cfc8d57..038a294 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -28,7 +28,6 @@
 	<!-- <link rel="stylesheet" type="text/css" href="pages/css/mylayui.css"> -->
 	<script type="text/javascript" src="js/echarts.js"></script>
 	<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
-	<script type="text/javascript" src="js/base.js"></script>
 	<script type="text/javascript" src="js/right-menu.js"></script>
 	<style>
 		body {

--
Gitblit v1.9.1