冲突文件

yujian

2019-07-10 aad0554cc7f18a6ec05e2e5e646b5e501d41617d

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserMoneyDetailService.java

@@ -76,4 +76,15 @@
   public BigDecimal statisticUserTypeMoneyWithDate(Long uid, List<UserMoneyDetailTypeEnum> typeList, Date minDate,

         Date maxDate);



   /**

    * 根据类型，用户ID与唯一标识符查询

    * 
    * @param type

    * @param uid

    * @param sourceIdentifyId

    * @return

    */

   public UserMoneyDetail selectByTypeAndUidAndIdentifyCode(UserMoneyDetailTypeEnum type, Long uid,

         Long sourceIdentifyId);



}