Merge branch 'mater-1.6.0' into div

admin

2019-08-26 1d1c321cdb8905d8c89c26637d36b975c4b12742

 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);



}