8/16

2023-08-16 16:36:44 +08:00
parent 00b182ee7c
commit 65d85f9ac7
1 changed files with 0 additions and 4 deletions
--- a/ZR.Service/System/CommonLangService.cs
+++ b/ZR.Service/System/CommonLangService.cs
@@ -110,11 +110,7 @@ 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();//插入可插入部分;