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

yujian

2020-01-01 eed54c262df12dd3d132bf14691915e6183afd4c

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

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

      } catch (Exception e) {

      }

   }

	
	
	
   }
}