Merge branch 'dev/dev_xp' into dev/dev

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

@@ -57,6 +57,11 @@ public class Account implements Serializable {
      */
     private String country;
 
+    /**
+     * 职业
+     */
+    private String occupation;
+
     /**
      * 账户有效期开始时间
      */

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

@@ -10,4 +10,7 @@ import lombok.EqualsAndHashCode;
 public class Tags extends BaseEntity{
 
     private String tagName;
+
+    // 表示标签是否正在活动中 0->不在活动中 1->在活动中
+    private byte active = (byte)0;
 }