Merge remote-tracking branch 'origin/master'

admin

2018-12-26 f4b0bb5dfda8f21409b9eb0b2ee6e436c87475e3

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

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

    */

   int countTodayComplete();

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



}