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

yujian

2019-12-31 06c9ac9b43af8492a9dbd1eee1a309170eed71d9

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

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

      } catch (Exception e) {

      }

   }

	
	
	
   }
}