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_DialogCapacityAllocationResultsRuleConfiguration/Component_pnlContent.def |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Component_pnlContent.def
index 320176c..f885a86 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Component_pnlContent.def
@@ -23,7 +23,7 @@
       Properties:
       [
         DataBinding: 'DataHolderDialogData.Data.ModuleMaterialCode'
-        Label: '妯℃澘鐗╂枡缂栫爜'
+        Label: '妯℃澘浜ф垚鍝両D'
         Taborder: 1
       ]
     }
@@ -45,7 +45,7 @@
       Properties:
       [
         DataBinding: 'DataHolderDialogData.Data.StockingPointID'
-        Label: '搴撳瓨鐐笽D'
+        Label: '妯$粍浜ф垚鍝佸簱瀛樼偣ID'
         Taborder: 3
       ]
     }

--
Gitblit v1.9.3