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

mitao

2025-04-11 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9

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

@@ -16,6 +16,7 @@
public interface HuiminCardMapper extends BaseMapper<THuiminCard> {

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

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