冲突提交

yujian

2019-03-12 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractMapper.java

@@ -92,5 +92,7 @@
    * @return

    */

   int countTodayComplete();

	
   double countTodayMoney(@Param("uid") Long uid);



}