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

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

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

@@ -90,4 +90,13 @@
    */
   public int countWeiQuanOrderWithMinCommision(@Param("uid")Long uid,@Param("minMoney") BigDecimal minMoney,@Param("minTime") Date minTime);

	
   /**
    * 根据订单ID与来源类型查询
    * @param orderId
    * @param sourceType
    * @return
    */
   public List<HongBaoOrder> listByOrderIdAndSourceType(@Param("orderId") String orderId,
         @Param("sourceType") int sourceType);
}