Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-25 59aced4fe04f7e2fdcca81cb9ef279a70522301e

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

@@ -122,7 +122,8 @@


   @Resource

   private UserMoneyExtraService userMoneyExtraService;



	
	
   @RequestMapping(value = "testimg")

   public void testImg(HttpServletRequest request, PrintWriter out) {

      long startTime = System.currentTimeMillis();

@@ -488,4 +489,7 @@
      } catch (Exception e) {

      }

   }

	
	
	
}