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/CommonHelper.cs | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 763f657..090191f 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"
@@ -41,8 +41,16 @@
{
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);//瀹炰緥鍚�
+
+ str = str.Replace("$LikeQueryAttrs$", param.LikeQueryAttrs);
+ str = str.Replace("$LikeQueryAttrsName$", param.LikeQueryAttrsName);
+ str = str.Replace("$ValidateRepeatName$", param.ValidateRepeatName);
+ str = str.Replace("$DeleteAlertAttr$", param.DeleteAlertAttr);
}
--
Gitblit v1.9.3