Merge branch 'feature-content5' into developer

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

@@ -164,6 +164,7 @@ public class ContentAIController {
         exportVideoQDTO.setUserId(cmeExportVideo.getClerkId());
         exportVideoQDTO.setUserCode(cmeExportVideo.getClerkCode());
         exportVideoQDTO.setUserName(cmeExportVideo.getClerkName());
+        exportVideoQDTO.setName(cmeExportVideo.getName());
         CmeExportVideoQDTO cmeExportVideoQDTO = EntityUtil.changeEntityByJSON(CmeExportVideoQDTO.class, cmeExportVideo);
         cmeExportVideoQDTO.setFactoryCode(factoryCode);
         try {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/ai/CmeExportVideoQO.java

@@ -54,6 +54,11 @@ public class CmeExportVideoQO extends CmeExportVideo implements Serializable {
      */
     private String clerkName;
 
+    /**
+     * 父级id (视频所属的分组id)
+     */
+    private String parentId;
+
     public Long getContentTemplateId() {
         return contentTemplateId;
     }
@@ -117,4 +122,12 @@ public class CmeExportVideoQO extends CmeExportVideo implements Serializable {
     public void setClerkName(String clerkName) {
         this.clerkName = clerkName;
     }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/account/AccountAuthorizeVo.java

@@ -20,6 +20,13 @@ public class AccountAuthorizeVo implements Serializable {
      */
     private String qrCode;
 
+    /**
+     * 状态
+     * 1 初始化中 (此时携带key轮询生成二维码)
+     * 2 已完成 （此时会返回二维码数据）
+     */
+    private Integer status;
+
     public String getKey() {
         return key;
     }
@@ -35,4 +42,12 @@ public class AccountAuthorizeVo implements Serializable {
     public void setQrCode(String qrCode) {
         this.qrCode = qrCode;
     }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
 }