Merge remote-tracking branch 'origin/master'

rk

18 小时以前 4d2dda710968035fa52e69dea47525985674422b

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