Merge branch 'aj_ppt' into debug

models/ppt_english/ppt_english_group.go

@@ -212,6 +212,7 @@ type RespGroupPptNameListItem struct {
 	PptPage       int    `description:"PPT总页数"`
 	IsReceived    int8   `description:"是否收到的共享，0：不是，1：是"`
 	IsGrant       int8   `description:"是否分配了权限，0：不是，1：是"`
+	TitleSetting  string `description:"PPT标题设置"`
 }
 
 type RespGroupPptListItem struct {

models/ppt_v2_group.go

@@ -212,6 +212,7 @@ type RespGroupPptNameListItem struct {
 	PptPage       int    `description:"PPT总页数"`
 	IsReceived    int8   `description:"是否收到的共享，0：不是，1：是"`
 	IsGrant       int8   `description:"是否分配了权限，0：不是，1：是"`
+	TitleSetting  string `description:"PPT标题设置"`
 }
 
 type RespGroupPptListItem struct {

services/ppt/ppt_english_group.go

@@ -753,6 +753,7 @@ func CopyPptEnglish(pptId int, groupId int64, adminId int, adminRealName string)
 		ModifyTime:    time.Now(),
 		AdminId:       adminId,
 		AdminRealName: adminRealName,
+		TitleSetting:  pptInfo.TitleSetting,
 	}
 	newPptList = append(newPptList, newPpt)
 
@@ -800,6 +801,7 @@ func CopyPptEnglish(pptId int, groupId int64, adminId int, adminRealName string)
 		AdminRealName: newPpt.AdminRealName,
 		PptCreateTime: newPpt.CreateTime.Format(utils.FormatDateTime),
 		PptPage:       pptPage,
+		TitleSetting:  newPpt.TitleSetting,
 	}
 	return
 }

services/ppt/ppt_group.go

@@ -947,6 +947,7 @@ func CopyPpt(pptId int, groupId int64, adminId int, adminRealName string) (resp
 		AdminId:       adminId,
 		AdminRealName: adminRealName,
 		PptVersion:    pptInfo.PptVersion,
+		TitleSetting:  pptInfo.TitleSetting,
 	}
 	newPptList = append(newPptList, newPpt)
 
@@ -999,6 +1000,7 @@ func CopyPpt(pptId int, groupId int64, adminId int, adminRealName string) (resp
 		ReportCode:    newPpt.ReportCode,
 		PptCreateTime: newPpt.CreateTime.Format(utils.FormatDateTime),
 		PptPage:       pptPage,
+		TitleSetting:  newPpt.TitleSetting,
 	}
 	return
 }