Merge remote-tracking branch 'origin/master'

doum

12 小时以前 1af395ecb948a9d0af14aa72d7fc8025e849e6bc

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