Merge branch 'master' into div

yujian

2019-07-16 a503900f405a39f3aa30a8663ca661cf3c6b55ea

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



}