From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/webapp/admin/new/js/jsp/controller.jsp |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/fanli/src/main/webapp/admin/new/js/jsp/controller.jsp b/fanli/src/main/webapp/admin/new/js/jsp/controller.jsp
index 6a3ef2f..b72101b 100644
--- a/fanli/src/main/webapp/admin/new/js/jsp/controller.jsp
+++ b/fanli/src/main/webapp/admin/new/js/jsp/controller.jsp
@@ -1,14 +1,14 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-	import="com.baidu.ueditor.ActionEnter"
-    pageEncoding="UTF-8"%>
-<%@ page trimDirectiveWhitespaces="true" %>
-<%
-
-    request.setCharacterEncoding( "utf-8" );
-	response.setHeader("Content-Type" , "text/html");
-	
-	String rootPath = application.getRealPath( "/" );
-	
-	out.write( new ActionEnter( request, rootPath ).exec() );
-	
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	import="com.baidu.ueditor.ActionEnter"
+    pageEncoding="UTF-8"%>
+<%@ page trimDirectiveWhitespaces="true" %>
+<%
+
+    request.setCharacterEncoding( "utf-8" );
+	response.setHeader("Content-Type" , "text/html");
+	
+	String rootPath = application.getRealPath( "/" );
+	
+	out.write( new ActionEnter( request, rootPath ).exec() );
+	
 %>
\ No newline at end of file

--
Gitblit v1.8.0