Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/HongBaoOrderMapper.java

@@ -109,4 +109,17 @@
    */

   public List<HongBaoOrder> listDetailByOrderIdAndSourceType(@Param("orderId") String orderId,

         @Param("sourceType") int sourceType);

}
	
	


   /**

    * 根据订单ID与来源类型查询详情

    * @param orderId

    * @param sourceType

    * @return

    */

   public List<HongBaoOrder> listDetailByOrderIdAndSourceTypeAndUid(@Param("orderId") String orderId,

         @Param("sourceType") int sourceType, @Param("uid") long uid);

}