From d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86 Mon Sep 17 00:00:00 2001
From: yanweiyuan3 <yanweiyuan3@gmail.com>
Date: 星期二, 10 十月 2023 17:45:58 +0800
Subject: [PATCH] Merge branch 'dev' into dev_yy

---
 _Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Component_ListFillingScheme.def |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Component_ListFillingScheme.def b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Component_ListFillingScheme.def
index 30b376c..ebdc6ed 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Component_ListFillingScheme.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Component_ListFillingScheme.def
@@ -28,7 +28,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SchemeName","title":"SchemeName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SchemeName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"BusinessType","title":"BusinessType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"BusinessType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SalesSegmentName","title":"SalesSegmentName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SalesSegmentName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Customer","title":"Customer","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Customer"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SchemeDate","title":"SchemeDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SchemeDate"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SchemeName","title":"鏂规鍚嶇О","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SchemeName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"BusinessType","title":"浜嬩笟閮�","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"BusinessType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SalesSegmentName","title":"閿�鍞儴闂�","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SalesSegmentName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Customer","title":"瀹㈡埛鍚嶇О","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Customer"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SchemeDate","title":"鏂规鐢熸垚鏃堕棿","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SchemeDate"}}]'
         ContextMenu: 'Menurelease'
         Taborder: 2
       ]

--
Gitblit v1.9.3