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

无关风月

6 天以前 e8f01399a49bb718f184e31d0f6de27c3dc64cef

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