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

peng

2 天以前 803a61d1d89e75f0b5d72785069b3dceb579f3ca

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


    /**