冲突

zs

2025-05-07 504eb4e5d48557eac2bcf233452e44964f0e0640

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/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();