Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -9,7 +9,7 @@
   
   int deleteByPrimaryKey(String id);

   UserTaoLiJinReport selectByPrimaryKey(String id);
   UserTaoLiJinReport selectByPrimaryKeyStr(String id);

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