Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 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() );

	
%>