From c6e8187d8a90489b985609fe7d94d4996ecee491 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期五, 15 十一月 2024 16:53:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine.def |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine.def
similarity index 68%
copy from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine.def
index 33c12ae..fb4edc1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine.def
@@ -1,24 +1,24 @@
 Quintiq file version 2.0
 Component PanelProductLine
 {
-  #keys: '[415136.0.1199302072]'
+  #keys: '[415136.0.1306620675]'
   BaseType: 'WebPanel'
   Children:
   [
-    Component ddslProductLine
+    Component ddsProductLine
     {
-      #keys: '[415136.0.1199302073]'
+      #keys: '[415136.0.1306620676]'
       BaseType: 'WebDropDownStringList'
       Properties:
       [
         Label: 'Product line'
+        Sorting: 'none'
         Taborder: 0
       ]
     }
   ]
   Properties:
   [
-    FixedSize: true
     Taborder: 1
   ]
 }

--
Gitblit v1.9.3