合并代码

zhibing.pu

2024-07-24 c493d7d249a2b80555d64470a7f6112dd979d6fc

 cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserPointsMerchandiseMapper.java

@@ -28,4 +28,6 @@
    Object changeState(List<Integer> ids, Integer state);

    List<ConsumeDetail> getConsumeDetails(BillingDataRequestVo requestVo);

    List<ConsumeDetail> getConsumeDetails1(BillingDataRequestVo requestVo);
}