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

mitao

2025-04-11 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9

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

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

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

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