Merge branch 'refs/heads/dev/dev' into dev/dev_xp

src/main/java/com/ai/da/mapper/primary/TrialOrderMapper.java

@@ -3,6 +3,7 @@ package com.ai.da.mapper.primary;
 import com.ai.da.common.config.mybatis.plus.CommonMapper;
 import com.ai.da.mapper.primary.entity.TrialOrder;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -15,6 +16,4 @@ public interface TrialOrderMapper extends CommonMapper<TrialOrder> {
 
     Map<String, Long> countOfficialUser();
 
-
-
 }

src/main/java/com/ai/da/mapper/primary/entity/AccountExtend.java

@@ -0,0 +1,30 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("account_extend")
+public class AccountExtend implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Long accountId;
+
+    private String authType;
+
+    private String auth;
+}

src/main/java/com/ai/da/mapper/primary/entity/AccountExtendMapper.java

@@ -0,0 +1,17 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Mapper 接口
+ *
+ * @author easy-generator
+ * @since 2022-06-13
+ */
+public interface AccountExtendMapper extends CommonMapper<AccountExtend> {
+
+
+}

src/main/java/com/ai/da/mapper/primary/entity/GoogleUser.java

@@ -0,0 +1,10 @@
+package com.ai.da.mapper.primary.entity;
+
+import lombok.Data;
+
+@Data
+public class GoogleUser {
+    private String id;
+    private String email;
+    private String name;
+}