Merge branch 'aj_ppt' into debug

controllers/ppt_v2.go

@@ -1135,6 +1135,7 @@ func (this *PptV2Controller) ToEn() {
 		ModifyTime:    time.Now(),
 		AdminId:       this.SysUser.AdminId,
 		AdminRealName: this.SysUser.RealName,
+		TitleSetting:  origin.TitleSetting,
 	}
 	newId, e = ppt_english.AddPptEnglish(pptInfo)
 	if e != nil {

services/ppt/ppt_english_group.go

@@ -215,6 +215,7 @@ func CopyEnglishGroup(groupId int64, adminId int, adminRealName string) (err err
 			ModifyTime:    time.Now(),
 			AdminId:       adminId,
 			AdminRealName: adminRealName,
+			TitleSetting:  v.TitleSetting,
 		}
 		newPptList = append(newPptList, tmp)
 	}

services/ppt/ppt_group.go

@@ -385,6 +385,7 @@ func CopyGroup(groupId int64, adminId int, adminRealName string) (err error) {
 			AdminId:       adminId,
 			AdminRealName: adminRealName,
 			PptVersion:    v.PptVersion,
+			TitleSetting:  v.TitleSetting,
 		}
 		newPptList = append(newPptList, tmp)
 	}