Merge remote-tracking branch 'origin/master'

yujian

2019-06-11 0de49bbc0f8bef524a16a877a166ba656cf2e929

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java

@@ -598,7 +598,8 @@
            vo.setRead(false);

         else

            vo.setRead(true);

      }

      } else

         vo.setRead(true);



      return vo;

   }