冲突文件

yujian

2019-07-10 aad0554cc7f18a6ec05e2e5e646b5e501d41617d

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java

@@ -734,7 +734,7 @@
   }



   @Override

   public BigDecimal sumTodayApplyMoney(Long uid) {

      return extractMapper.sumToadyApplyByUid(uid);

   public BigDecimal sumTodayApplyMoney(Long uid,String day) {

      return extractMapper.sumToadyApplyByUid(uid,day);

   }

}