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

peng

5 天以前 134f5b1aedeb90b9f7a71dc41e8f08e96bcb3f85

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


    /**