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_FormAssemblyOnlinePlanVersion/Component_PanelProductLine#623.def |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine.def "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine\043623.def"
similarity index 69%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine\043623.def"
index 33c12ae..e027346 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlanVersion/Component_PanelProductLine\043623.def"
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component PanelProductLine
+Component PanelProductLine id:PanelProductLine_623
 {
-  #keys: '[415136.0.1199302072]'
+  #keys: '[415136.0.1307730382]'
   BaseType: 'WebPanel'
   Children:
   [
     Component ddslProductLine
     {
-      #keys: '[415136.0.1199302073]'
+      #keys: '[415136.0.1307730383]'
       BaseType: 'WebDropDownStringList'
       Properties:
       [
@@ -18,7 +18,6 @@
   ]
   Properties:
   [
-    FixedSize: true
     Taborder: 1
   ]
 }

--
Gitblit v1.9.3