Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-13 ca81ac257960fcb135fe542a49c28bc871b14e2a

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserGoodsStorageMapper.java

@@ -78,4 +78,6 @@
    * @return
    */
   List<UserGoodsStorage>  listQueryByIds(List<Long> list);
	
   void updateShareState(@Param("shareId") Long shareId);
}