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

netflix-dao/src/main/java/com/cyksj/mapper/OrderDonMapper.java

@@ -92,5 +92,5 @@ public interface OrderDonMapper extends BaseMapper<OrderDon> {
 
 	BigDecimal getCouponUsedMoney(Long couponId);
 
-	Integer checkUserHasPaidMjMirror(@Param("userIdList") List<Long> userIdList);
+	Integer checkUserHasPaidMjMirror(@Param("list") List<Long> userIdList);
 }