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

yujian

2020-01-01 d029dafc262bc3c8ddc8ca6b85e4fa6e073d764a

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

@@ -488,8 +488,5 @@
         }

      } catch (Exception e) {

      }

   }

	
	
	
   }
}