Merge branch 'mater-1.6.0' into div

admin

2019-08-22 a9b7fab63c4345a6b183bffdab1bb0884f4202b5

 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoManageService.java

@@ -119,6 +119,8 @@
    * 

    * @return

    */

   public BigDecimal getTLJShareRate();

   public BigDecimal getTLJShareRate(long time);

	
	


}