Merge branch 'pay_master' into dev

bingbing

2020-10-26 34589cd092e0de8cfd704cd59608ed0f36f6093a

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ConsumptionRecordMapper.java

@@ -42,5 +42,5 @@
     * @param DetailList 有效的套餐
     * @return
     */
    List<ConsumptionRecord> findDetailList(@Param("p") List<Long> DetailList);
    List<ConsumptionRecord> findDetailList(@Param("DetailList") List<Long> DetailList);
}