Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
commit
b355cd0ba7
|
|
@ -349,10 +349,10 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
|
|||
|
||||
@Override
|
||||
public Page<InviteUserVO> getInviteUser(Long id, Integer page, Integer size) {
|
||||
return pageAs(new Page<>(page, size), QueryWrapper.create()
|
||||
return shopUserService.pageAs(new Page<>(page, size), QueryWrapper.create()
|
||||
.select("head_img as headImg,nick_name as shopUserName,phone as shopUserPhone,one_income as oneIncome")
|
||||
.eq(ShopUser::getDistributionUserId, id)
|
||||
.orderBy(MkDistributionUser::getCreateTime).desc(), InviteUserVO.class);
|
||||
.orderBy(ShopUser::getCreateTime).desc(), InviteUserVO.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
Loading…
Reference in New Issue