Merge branch 'fix-bug-20190905' into test1.2

# Conflicts:
#	base/src/main/java/com/yoho/datasync/core/base/model/yh_community/UserInfo.java

@@ -5,6 +5,8 @@ import lombok.Data;
 @Data
 public class UserInfo {
 
+  private Integer id;
+
   private String nickName;
 
   private String gender;