冲突文件

yujian

2019-06-24 bd331a582851cffcce54316e677e23760de4f384

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

@@ -79,5 +79,4 @@
    */
   List<UserGoodsStorage>  listQueryByIds(List<Long> list);
   
   void updateShareStateByCommonGoodsId(@Param("commonGoodsId") Long commonGoodsId);
}