From 504eb4e5d48557eac2bcf233452e44964f0e0640 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 12:06:51 +0800
Subject: [PATCH] 冲突
---
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
index bcb9e86..72e63b3 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
@@ -2218,14 +2218,12 @@
List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
foreach (var columnModel in newList)
{
-<<<<<<< HEAD
+
//棣栧瓧姣嶅皬鍐�
var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName}, \n");
-=======
- var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
- sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName}, || ''\n");
->>>>>>> a1cdc5e71aa827651a6c3e313fd7acc95b09c097
+
+
}
//鍘绘帀鏈�鍚庝竴涓�,
var res = sb.ToString();
--
Gitblit v1.9.3