Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/config/HongBaoManageService.java

@@ -18,6 +18,8 @@
   public String get(String key);



   public BigDecimal getByKeyAndMaxTime(String key, Long time);

	
   public BigDecimal getByKeyAndMaxTimeCache(String key, Long time);



   public Map<String, String> convertMap();



@@ -172,5 +174,7 @@
    * @return

    */

   public BigDecimal getBaseFanliRate();

	
   public BigDecimal getBaseFanliRateCache(long time);



}