From 44f6b5306f7927485c49d4655d370f4693cdabfd Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 06 5月 2025 09:20:27 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 Weben_CMS专用代码生成器/Code/Utility/CommonHelper.cs |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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/CommonHelper.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/CommonHelper.cs"
index 5d6d6b9..a6d8380 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/CommonHelper.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/CommonHelper.cs"
@@ -23,7 +23,9 @@
         /// <returns></returns>
         public static bool IsIgnore(string columnName)
         {
-            if (columnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper())
+            if (columnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
+                || columnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
+                )
             {
                 return true;
             }
@@ -39,8 +41,11 @@
         {
             str = str.Replace("$NameSpacePath$", param.NameSpacePath);//鍛藉悕绌洪棿
             str = str.Replace("$ChinaComment$", param.ChinaComment);//涓枃娉ㄩ噴
+            str = str.Replace("$PageMenuName$", param.PageMenuName);//涓枃娉ㄩ噴
+            str = str.Replace("$PageMenuInstanceName$", param.PageMenuInstanceName);//涓枃娉ㄩ噴
             str = str.Replace("$EntityName$", param.EntityName);//瀹炰綋绫诲悕
             str = str.Replace("$Modulelogo$", param.Modulelogo);//妯″潡绠�鍐�
+            str = str.Replace("$EntityInstanceName$", param.EntityInstanceName);//瀹炰緥鍚�
 
         }
 

--
Gitblit v1.9.3