Merge commit 'd1108700e0ad43b6bfea3f9a79bbb14799a2d29c'

ZR.Service/System/CommonLangService.cs

@@ -82,7 +82,7 @@ namespace ZR.Service.System
                     LangName = item.LangName,
                 });
             }
-            var storage = Storageable(langs)
+            var storage = Context.Storageable(langs)
                 .WhereColumns(it => new { it.LangKey, it.LangCode })
                 .ToStorage();
 
@@ -110,7 +110,11 @@ namespace ZR.Service.System
         /// <returns></returns>
         public (string, object, object) ImportCommonLang(List<CommonLang> list)
         {
+<<<<<<< HEAD
             var x = Storageable(list)
+=======
+            var x = Context.Storageable(list)
+>>>>>>> d1108700e0ad43b6bfea3f9a79bbb14799a2d29c
                 .WhereColumns(it => new { it.LangKey, it.LangCode })
                 .ToStorage();
             x.AsInsertable.ExecuteReturnSnowflakeIdList();//插入可插入部分;