Merge remote-tracking branch 'origin/div' into div

admin

2019-10-12 4706fa0dcd761c13f0f7f33e4e7ab804e0a21f4f

 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);

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