Merge remote-tracking branch 'origin/send_coupon' into user_action

peng

4 天以前 f931144c06ce670ee0eb7384ea05cde4c4497dd3

 framework/src/main/java/cn/lili/modules/lmk/service/CustomerService.java

@@ -34,7 +34,7 @@
     * @param id 会员id
     * @return 用户VO
     */
    MemberVO getMember(String id);
    Result getMember(String id);


    /**