Merge branch 'master' of http://8.137.159.94:3000/glz/QYZH.InteractiveMagazine

QYZH.InteractiveMagazine.Models/Entity/JournalPageTask.cs

@@ -122,18 +122,11 @@ namespace QYZH.InteractiveMagazine.Models.Entity
         public bool NeedAiProcess { get; set; }
 
         /// <summary>
-        /// Desc:基础Prompt配置ID（为空则使用IsDefault=1的模板）
+        /// Desc:Prompt配置
         /// Default:
         /// Nullable:True
         /// </summary>           
-        public string BasePrompt { get; set; }
-
-        /// <summary>
-        /// Desc:个性化Prompt（追加到基础Prompt后面，可为空）
-        /// Default:
-        /// Nullable:True
-        /// </summary>           
-        public string CustomPrompt { get; set; }
+        public string Prompt { get; set; }
 
         /// <summary>
         /// Desc:作答参考时间