Merge remote-tracking branch 'origin/master'

admin

2019-07-09 b5624f9e80d4fa8d9bb42f759b47f8059ba6a0eb

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/MaskKeyServiceImpl.java

@@ -15,10 +15,10 @@


   @Override

   public boolean examineContent(String content) {

      boolean isValid = true;

      boolean isValid = false;

      int count = maskKeyMapper.examineContent(content);

      if (count > 0) {

         isValid = false;

         isValid = true;

      }



      return isValid;