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

无关风月

8 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

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