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

mitao

2025-03-31 51f26723bee741bf112c8d0d965d0e2f2974bd04

 cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminCardService.java

@@ -7,6 +7,7 @@
import com.dsh.activity.model.BenefitsVideosInfoVo;
import com.dsh.activity.model.BenefitsVideosListVo;
import com.dsh.activity.model.response.HuiminCardVO;
import com.dsh.activity.model.response.MyHuiminCardVO;

import java.util.List;

@@ -21,4 +22,6 @@
public interface HuiminCardService extends IService<THuiminCard> {

    List<THuiminCard> getHuiminAgreementAndList(Integer pageNo, Integer pageSize, Integer storeId);

    List<MyHuiminCardVO> getMyHuiminCardList(Integer pageNo, Integer pageSize, Integer appUserId);
}