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

# Conflicts:
#	src/main/java/com/ai/da/common/utils/SendEmailUtil.java
#	src/main/java/com/ai/da/mapper/primary/entity/Account.java

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

@@ -1,6 +1,7 @@
-package com.ai.da.mapper.primary.entity;
+package com.ai.da.mapper.primary;
 
 import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.AccountExtend;
 
 import java.util.Date;
 import java.util.List;

src/main/java/com/ai/da/mapper/primary/ProductImageAttributeMapper.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.ProductImageAttribute;
+
+public interface ProductImageAttributeMapper extends CommonMapper<ProductImageAttribute> {
+}

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

@@ -97,6 +97,10 @@ public class Account implements Serializable {
      * 2 ： 月付用户
      * 3 ： 试用用户
      * 4 ： 参加活动获取30天有效期和6000个积分的用户
+     * 5 ： 企业管理员账号
+     * 6 ： 企业子账号
+     * 7 ： 学校管理员
+     * 8 ： 学校子账号
      */
     private Integer systemUser;
 
@@ -105,6 +109,15 @@ public class Account implements Serializable {
      */
     private String avatar;
 
-    private Long invitationCode;
+    private String organizationName;
 
+    private Long parentId;
+
+    private Integer isAdmin;
+
+    private BigDecimal shareCredits;
+
+    private Integer subAccountNum;
+
+    private String invitationCode;
 }

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

@@ -1,5 +1,6 @@
 package com.ai.da.mapper.primary.entity;
 
+import com.ai.da.common.response.PageResponse;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -26,5 +27,9 @@ public class AccountExtend implements Serializable {
 
     private String authType;
 
+    private String headImgUrl;
+
+    private String name;
+
     private String auth;
 }

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

@@ -4,7 +4,11 @@ import lombok.Data;
 
 @Data
 public class GoogleUser {
-    private String id;
+    private String sub;  // 用户唯一标识
     private String email;
     private String name;
+    private String picture;
+    private boolean emailVerified;
+    private String givenName;
+    private String familyName;
 }

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

@@ -0,0 +1,35 @@
+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("product_image_attribute")
+public class ProductImageAttribute implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    private String imgName;
+    private String length;
+    private String sleeveLength;
+    private String sleeveShape;
+    private String sleeveShoulder;
+    private String neckline;
+    private String collar;
+    private String design;
+    private String silhouette;
+    private String type;
+    private String openingType;
+    private String subtype;
+
+    private String style;
+}

src/main/java/com/ai/da/mapper/secondary/entity/AttributeRetrieval.java

@@ -19,6 +19,4 @@ public class AttributeRetrieval {
     private String subtype;
 
     private String style;
-
-    private Integer deprecated;
 }