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

peng

8 天以前 fa6528a77821c3fb7a46c2a8b63a2adb6da4fc10

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


    /**