Merge remote-tracking branch 'origin/hph' into test
This commit is contained in:
@@ -85,10 +85,10 @@ public class MemberService {
|
||||
private TbOrderInfoMapper tbOrderInfoMapper;
|
||||
private MpShopTableMapper mpShopTableMapper;
|
||||
|
||||
public Result queryMember(String shopId, String phone, int page, int pageSize) {
|
||||
public Result queryMember(String shopId, String phone,String isFlag, int page, int pageSize) {
|
||||
|
||||
PageHelperUtil.startPage(page, pageSize);
|
||||
List<TbShopUser> tbShopUsers = tbShopUserMapper.selectByShopId(shopId, phone);
|
||||
List<TbShopUser> tbShopUsers = tbShopUserMapper.selectByShopId(shopId, phone,isFlag);
|
||||
PageInfo pageInfo = new PageInfo(tbShopUsers);
|
||||
return Result.success(CodeEnum.SUCCESS, pageInfo);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user