冲突产生的文件

yujian

2019-06-25 e048db91382fa13e0b53e170390eea5fb5931221

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