Merge branch 'abroad_073' into abroad_pre

netflix-dao/src/main/java/com/cyksj/model/entity/User.java

@@ -91,6 +91,11 @@ public class User extends BaseEntity implements Serializable{
     @TableField(exist = false)
     private Long phoneUserId;
 
+    /**
+     * 是否是谷歌授权登录
+     */
+    private Boolean isGoogle;
+
     @Getter
     public enum RegisterEnv{
         wx("公众号h5授权登录"),

netflix-service/src/main/java/com/cyksj/service/user/impl/UserServiceImpl.java

@@ -230,6 +230,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 			String registerEnv = loginReq.getRegisterEnv();
 			user.setRegisterEnv(StrUtil.isEmpty(registerEnv) ? User.RegisterEnv.pc.name() : registerEnv);
 			if (loginReq.getType() == 3) {
+				user.setIsGoogle(true);
 				user.setEmail(loginReq.getEmail());
 			}
 			this.save(user);