Merge branch 'master_activity' into dev

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/UserBiz.java

@@ -81,6 +81,7 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
             userId=uses.get(0).getId();
             user.setId(userId);
         }else {
+            user.setId(null);
             Long time=System.currentTimeMillis()/1000L;
             user.setWeId(weId);
             user.setRId(rId);