Merge remote-tracking branch 'origin/master'

44323

2023-10-10 5a7de6a73c756ae8e7af2b3e002d6fb52c5cf04c

 cloud-server-account/src/main/java/com/dsh/account/mapper/RechargeRecordsMapper.java

@@ -22,6 +22,6 @@
public interface RechargeRecordsMapper extends BaseMapper<RechargeRecords> {

    List<RechargeRecordsVO> rechargeList(@Param("query") RechargeRecordsQuery query,@Param("sTime")String sTime,@Param("eTime")String eTime);
    List<VipPayment> listAll(@Param("query") IncomeQuery query, @Param("sTime")String sTime, @Param("eTime")String eTime, @Param("amount") BigDecimal amount);
    List<VipPayment> listAll(@Param("query") IncomeQuery query, @Param("sTime")String sTime, @Param("eTime")String eTime, @Param("amount") BigDecimal amount,@Param("insertType")Integer insertType);

}