Merge remote-tracking branch 'origin/master'

admin

2019-06-27 69e16079864ca08dca53637f969ac1463a491110

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



}