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

admin

2019-09-09 61c21f17b1ad94e4b0018c7e385195bab21b0b5c

 fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java

@@ -121,17 +121,15 @@
      }

   }



	
	
   /**

    * 查询列表 - 新后台

    * 
    * 版本号信息

    * @param callback

    * @param key

    *            查询词 名称

    * @param pageIndex

    * @param out

    */

   @RequestMapping(value = "getVersionList")

   public void getVersionList(String callback, String key, Integer pageIndex, PrintWriter out) {

   public void getVersionList(String callback, PrintWriter out) {



      try {

         AppVersionInfo appVersionInfo = new AppVersionInfo();