Merge branch 'master' into div1

yujian

2018-12-29 2dff570ccfa532f8c012bc13829b302dd3e1b9d3

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

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

    */

   int countTodayComplete();

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



}