Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 ae3e722d471d7e844acd25f124a1fec42ac714a0

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

@@ -45,5 +45,12 @@
    * @return

    */

   public long countByOrderNoAndHongBaoType(String orderNo, int type);

	
   /**

    * 获取详情

    * @param commonOrderId

    * @return

    */

   public HongBaoOrder selectDetailByCommonOrderId(Long commonOrderId);



}