From 800a94c4088b5ad82bdb433a9199dc2183d86959 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 14 5月 2025 08:57:38 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 Weben_CMS专用代码生成器/Code/MainForm.cs |    5 +++--
 1 files changed, 3 insertions(+), 2 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/MainForm.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/MainForm.cs"
index a3cde54..23b5274 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/MainForm.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/MainForm.cs"
@@ -43,7 +43,7 @@
             this.tb_LikeQueryAttrsName.Text = "璇疯緭鍏ョ墿鏂欑紪鐮�/鐗╂枡鍚嶇О/澶囨敞";
 
             //this.tb_EntityProName.Text = "wmsMaterial";//瀹炰綋绫诲璞″悕
-            this.tb_EnumList.Text = "PurchaseType|PurchaseTypeEnum|PurchaseTypeDesc,MaterialType|MaterialTypeEnum|MaterialTypeDesc,IsMainBranch|YesNoEnum|IsMainBranchDesc";
+            this.tb_EnumList.Text = "PurchaseType,PurchaseTypeEnum&MaterialType,MaterialTypeEnum&IsMainBranch,YesNoEnum";
 
             this.cmb_DataSource.DropDownStyle = ComboBoxStyle.DropDownList;
             List<ListItem> itemList = CommonHelper.GetDataSources();
@@ -241,7 +241,8 @@
                     EntityInstanceName = tableAlias,
                     LikeQueryAttrs = _tb_LikeQueryAttrs,
                     LikeQueryAttrsName = _tb_LikeQueryAttrsName,
-                    ValidateRepeatName = this.tb_ValidateRepeatName.Text
+                    ValidateRepeatName = this.tb_ValidateRepeatName.Text,
+                    TableName = tableName
                 };
                 //澶勭悊鏋氫妇绫诲瀷
                 List<EnumModel> enumList = new List<EnumModel>();

--
Gitblit v1.9.3