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

yujian

2019-10-31 4f7ce4b7d2ad52f118c13e0f9f6fb2efd5b296ff

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/msg/MsgDeviceReadStateMapper.java

@@ -19,6 +19,9 @@
    */
   MsgDeviceReadState selectByDeviceAndPlatformAndType(@Param("device") String device, @Param("platform") int platform,
         @Param("type") String type);
	
   MsgDeviceReadState selectByDeviceAndPlatformAndTypeForUpdate(@Param("device") String device, @Param("platform") int platform,
         @Param("type") String type);

   /**
    * 设置所有消息已读