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

yujian

2020-03-17 2242a113524da059a402af214aec30126789ce1e

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

@@ -462,4 +462,9 @@
      data.put("waiters", jedisPool.getNumWaiters());

      out.print(data.toString());

   }

	
	
	
	
	
}