Merge remote-tracking branch 'origin/dev/dev' into dev/dev

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

@@ -0,0 +1,7 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.Questionnaire;
+
+public interface QuestionnaireMapper extends CommonMapper<Questionnaire> {
+}

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

@@ -87,5 +87,12 @@ public class Account implements Serializable {
      */
     private BigDecimal credits;
 
-    private Integer SystemUser;
+    /**
+     * 用于区分游客与系统用户
+     * 0 ： 游客
+     * 1 ： 年付用户
+     * 2 ： 月付用户
+     * 3 ： 试用用户
+     */
+    private Integer systemUser;
 }

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

@@ -12,6 +12,8 @@ import java.math.BigDecimal;
 public class CreditsDetail extends BaseEntity {
     /** 用户id */
     private Long accountId;
+    /** 任务id或uuid */
+    private String taskId;
     /** 积分变更事件 */
     private String changeEvent;
     /** 变更积分 ( + 表示加，- 表示减) */

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

@@ -0,0 +1,18 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("t_questionnaire")
+public class Questionnaire extends BaseEntity{
+
+    /**
+     * 用户所填调查问卷结果
+     */
+    private String questionnaireInfo;
+    /**
+     * 调查问卷标题
+     */
+    private String title;
+}