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

peng

14 小时以前 4372e6406222ce6b33f8c1c0703b460d39b5814e

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


    /**