冲突文件

yujian

2019-07-10 aad0554cc7f18a6ec05e2e5e646b5e501d41617d

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/UserTaoLiJinReportMapper.java

@@ -17,4 +17,10 @@
    * @return
    */
   List<UserTaoLiJinReport> needUpdateReport();
	
   /**
    * 退回未领取的淘礼金
    * @return
    */
   List<UserTaoLiJinReport> refundNotWin();
}