Merge branch 'send_coupon' into user_action

peng

1 天以前 e4dd7447aaa4563b9e64a7556710677a140776eb

 framework/src/main/java/cn/lili/modules/lmk/service/impl/CustomerServiceImpl.java

@@ -47,15 +47,12 @@
            return Result.error("该账号没有注册店铺");
        }
        return getMemberPage(customerQuery);

    }


    @Override
    public Result getMember(String id) {
        MemberVO memberVO = memberService.getMember(id);
        //查询用户标签
//        memberVO.setCustomerTagList();
        return Result.ok().data(memberVO);
    }