Merge remote-tracking branch 'origin/master'

admin

2019-04-12 45f35a348c6d19f954888bf3e595bdf9d6016bb8

 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java

@@ -172,4 +172,10 @@
         e.printStackTrace();

      }

   }

	
   @RequestMapping(value = "testhtml")

   public void testhtml(PrintWriter out) {

      out.print("<script>yestv.finishPage();</script>");

      out.close();

   }

}