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

yujian

2020-04-14 f4d4486e55b91ab2d6313c48dbe8500c3928e8fa

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

@@ -17,6 +17,8 @@
   public void update(List<HongBaoManage> hongBaoManageList);



   public String get(String key);

	
   public BigDecimal getByKeyAndMaxTime(String key, Long time);



   public Map<String, String> convertMap();