Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-16 8e631ceb2c08e6cd00e68b1aa9ad1fec7cea6a72

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMapService.java

@@ -28,6 +28,6 @@
    * @param uid

    * @return

    */

   public Map<String, BigDecimal> getCouponHongbaoByOrderNo(String orderNo, Long uid);

   public BigDecimal getCouponHongbaoByOrderNo(String orderNo, Long uid);



}