Merge branch 'DuGuYang' into develop

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -301,7 +301,7 @@ namespace MySystem.Areas.Admin.Controllers
                     var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == KqSnNo) ?? new PosMachinesTwo();
                     if (!string.IsNullOrEmpty(pos.SeoKeyword))
                     {
-                        if (pos.BrandId != 2 && pos.BrandId != 7)
+                        if (pos.BrandId != 2 && pos.BrandId != 7 && pos.BrandId != 10 && pos.BrandId != 11)
                         {
                             ReturnAmount += decimal.Parse(pos.SeoKeyword) / 100;
                         }
@@ -379,7 +379,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string SeoKeyword = "0";
                 if (!string.IsNullOrEmpty(pos.SeoKeyword))
                 {
-                    if (pos.BrandId != 2 && pos.BrandId != 7)
+                    if (pos.BrandId != 2 && pos.BrandId != 7 && pos.BrandId != 10 && pos.BrandId != 11)
                     {
                         SeoKeyword = (decimal.Parse(pos.SeoKeyword) / 100).ToString();
                     }