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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/test/java/org/fanli/config/SystemCouponServiceTest.java

@@ -17,6 +17,15 @@
      

      SystemCouponService service = BeanUtil.getBean(SystemCouponService.class);

      

      new Thread(new Runnable() {

         @Override

         public void run() {

            // TODO Auto-generated method stub

				
         }

      });

		
		
      for (int i = 1; i < 61 ;i ++) {

         

         if (i==10) {