Merge branch 'feature-content5' into developer

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentAccountController.java

@@ -89,6 +89,7 @@ public class ContentAccountController {
         AccountGenerateQrCodeQDTO accountGenerateQrCodeQDTO = new AccountGenerateQrCodeQDTO();
         accountGenerateQrCodeQDTO.setEnterpriseId(accountGenerateQrCodeQo.getEnterpriseId());
         accountGenerateQrCodeQDTO.setSourceType(ContentAccountQrCodeSourceType.HAOBAN.getCode());
+        accountGenerateQrCodeQDTO.setKey(accountGenerateQrCodeQo.getKey());
         ServiceResponse<AccountAuthorizeDTO> serviceResponse = contentAccountApiService.generateQrCode(accountGenerateQrCodeQDTO);
         if (!serviceResponse.isSuccess()) {
             return RestResponse.failure("500", "生成二维码异常");

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/account/AccountGenerateQrCodeQo.java

@@ -25,6 +25,11 @@ public class AccountGenerateQrCodeQo implements Serializable {
      */
     private String clerkId;
 
+    /**
+     * 二维码key
+     */
+    private String key;
+
     public String getEnterpriseId() {
         return enterpriseId;
     }
@@ -48,4 +53,12 @@ public class AccountGenerateQrCodeQo implements Serializable {
     public void setClerkId(String clerkId) {
         this.clerkId = clerkId;
     }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/video/CloudVideoInfoVo.java

@@ -12,6 +12,7 @@ import java.util.Date;
 public class CloudVideoInfoVo implements Serializable {
 
 
+
     /**
      * 视频库id
      */
@@ -80,6 +81,39 @@ public class CloudVideoInfoVo implements Serializable {
      */
     private Integer duration;
 
+    /**
+     * 视频比例
+     */
+    private String spare;
+
+    /**
+     * 账户类型
+     * 0 超管
+     * 1 导购
+     * 2 区经
+     */
+    private Integer userType;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 导购code
+     */
+    private String userCode;
+
+    /**
+     * 用户昵称
+     */
+    private String userName;
+
+    /**
+     * 视频所属分组链
+     */
+    private String groupName;
+
     public String getId() {
         return id;
     }
@@ -183,4 +217,52 @@ public class CloudVideoInfoVo implements Serializable {
     public void setDuration(Integer duration) {
         this.duration = duration;
     }
+
+    public String getSpare() {
+        return spare;
+    }
+
+    public void setSpare(String spare) {
+        this.spare = spare;
+    }
+
+    public Integer getUserType() {
+        return userType;
+    }
+
+    public void setUserType(Integer userType) {
+        this.userType = userType;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUserCode() {
+        return userCode;
+    }
+
+    public void setUserCode(String userCode) {
+        this.userCode = userCode;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
 }