Merge remote-tracking branch 'origin/master'

doum

12 小时以前 e68e324f91d1a4eb2d4c5f07d27ca105a308bc0c

 server/dmmall_service/src/main/java/com/doumee/service/business/MemberService.java

@@ -127,7 +127,7 @@
     * @param code
     * @return
     */
    AccountResponse wxLogin(String code,Integer recId);
    AccountResponse wxLogin(String code);


    AccountResponse wxLoginTest( Integer recId);