Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-13 ca81ac257960fcb135fe542a49c28bc871b14e2a

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

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

    */

   int countTodayComplete();

	


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



   /**

    * 获取补偿金额

    * 
    * @param uid

    * @return

    */

   BigDecimal computeCompensateByUid(Long uid);

}