fix merge confict

Author: shps951023

README.zh-CN.md

@@ -199,6 +199,18 @@ var value = new { title = "Hello MiniWord" };
 MiniWord.SaveAsByTemplate(outputPath, templatePath, value);
 ```
 
+### 字体ForeColor和BackColor功能
+```csharp
+var value = new
+{
+    Company_Name = new MiniWordColorText { Text = "MiniSofteware", ForeColor = "#eb70AB" },
+    Name = new MiniWordColorText { Text = "Jack", BackColor = "#eb70AB" },
+    CreateDate = new MiniWordColorText { Text = new DateTime(2021, 01, 01).ToString(), BackColor = "#eb70AB", ForeColor = "#ffffff" },
+    VIP = true,
+    Points = 123,
+    APP = "Demo APP",
+};
+```
 
 ### HyperLink
 

README.zh-Hant.md

@@ -197,6 +197,19 @@ var value = new { title = "Hello MiniWord" };
 MiniWord.SaveAsByTemplate(outputPath, templatePath, value);
 ```
 
+### 字体ForeColor和BackColor功能
+```csharp
+var value = new
+{
+    Company_Name = new MiniWordColorText { Text = "MiniSofteware", ForeColor = "#eb70AB" },
+    Name = new MiniWordColorText { Text = "Jack", BackColor = "#eb70AB" },
+    CreateDate = new MiniWordColorText { Text = new DateTime(2021, 01, 01).ToString(), BackColor = "#eb70AB", ForeColor = "#ffffff" },
+              
+    VIP = true,
+    Points = 123,
+    APP = "Demo APP",
+};
+```
 
 ### HyperLink
 

src/MiniWord/MiniWord.Implment.cs

@@ -212,6 +212,13 @@ private static void ReplaceText(OpenXmlElement xmlElement, WordprocessingDocumen
                                     run.Append(hyperlink);
                                     t.Remove();
                                 }
+                                else if (tag.Value is MiniWordColorText)
+                                {
+                                    var miniWordColorText = (MiniWordColorText)tag.Value;
+                                    var colorText = AddColorText(miniWordColorText);
+                                    run.Append(colorText);
+                                    t.Remove();
+                                }
                                 else
                                 {
                                     var newText = string.Empty;
@@ -271,7 +278,19 @@ private static Hyperlink GetHyperLink(MainDocumentPart mainPart, MiniWordHyperLi
             };
             return xmlHyperLink;
         }
+        private static RunProperties AddColorText(MiniWordColorText miniWordColorText)
+        {
+
+            RunProperties runPro = new RunProperties();
+            Text text = new Text(miniWordColorText.Text);
+            Color color = new Color() { Val = miniWordColorText.TextColor?.Replace("#", "") };
+            Shading shading = new Shading() { Fill = miniWordColorText.BackgroundColor?.Replace("#", "") };
+            runPro.Append(shading);
+            runPro.Append(color);
+            runPro.Append(text);
 
+            return runPro;
+        }
         private static void AddPicture(OpenXmlElement appendElement, string relationshipId, MiniWordPicture pic)
         {
             // Define the reference of the image.

src/MiniWord/MiniWordColorText.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MiniSoftware
+{
+  public  class MiniWordColorText
+    {
+        public string TextColor { get; set; }
+        public string Text { get; set; }
+        public string BackgroundColor { get; set; }
+    }
+}

tests/MiniWordTests/IssueTests.cs

@@ -598,6 +598,24 @@ public void TestIssue4_new()
             };
             MiniWord.SaveAsByTemplate(path, templatePath, value);
         }
+        [Fact]
+        public void TestColor()
+        {
+            var path = PathHelper.GetTempFilePath();
+            var templatePath = PathHelper.GetFile("TestBasicFill.docx");
+            var value = new
+            {
+                Company_Name = new MiniWordColorText { Text = "MiniSofteware", TextColor = "#eb70AB" },
+                Name = new MiniWordColorText { Text = "Jack", BackgroundColor = "#eb70AB" },
+                CreateDate = new MiniWordColorText { Text = new DateTime(2021, 01, 01).ToString(), BackgroundColor = "#eb70AB", TextColor = "#ffffff" },
+              
+                VIP = true,
+                Points = 123,
+                APP = "Demo APP",
+            };
+            MiniWord.SaveAsByTemplate(path, templatePath, value);
+        }
+
 
         #region Model:TestIssue18.docx
         public class Foo