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

yujian

2019-08-01 ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc

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

@@ -41,10 +41,11 @@
    * 根据订单号和订单来源获取数量

    * 

    * @param orderNo

    * @param type

    * @param hongBaotype

    * @param sourceType

    * @return

    */

   public long countByOrderNoAndHongBaoType(String orderNo, int type);

   public long countByOrderNoAndHongBaoType(String orderNo, int hongBaotype, int sourceType);

   

   /**

    * 获取详情