Merge branch 'dev' of http://git.izouma.com/licailing/jiashanxia into dev

src/main/java/com/izouma/jiashanxia/service/UserService.java

@@ -126,6 +126,7 @@ public class UserService {
     }
 
     public User loginMa(String code, Long parent, Boolean expert) {
+        log.info("maLogin:: code={} parent={} expert={}", code, parent, expert);
         try {
             WxMaJscode2SessionResult result = wxMaService.jsCode2SessionInfo(code);
             String openId = result.getOpenid();