Merge remote-tracking branch 'origin/master'

admin

2019-03-13 f1fdf1aec9fb9f8f4d1220d4c8b3489b648ab59b

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

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

    */

   int countTodayComplete();

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



}