Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

44323

2024-03-19 7b65fb8c1001850e468a51c2d9af474621ce7115

 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);
}