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_FormInventoryPlanArchive/Component_PanelPeriod#71.def | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelPeriod\043858.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelPeriod\04371.def"
similarity index 73%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelPeriod\043858.def"
rename to "_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelPeriod\04371.def"
index 1afed44..f1e7c43 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelPeriod\043858.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPlanArchive/Component_PanelPeriod\04371.def"
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component PanelPeriod id:PanelPeriod_858
+Component PanelPeriod id:PanelPeriod_71
{
- #keys: '[415136.0.1252790303]'
+ #keys: '[415136.0.1307935336]'
BaseType: 'WebPanel'
Children:
[
Component DateSelectorStart
{
- #keys: '[415136.0.1252790304]'
+ #keys: '[415136.0.1307935337]'
BaseType: 'WebDateSelector'
Properties:
[
@@ -17,7 +17,7 @@
}
Component DateSelectorEnd
{
- #keys: '[415136.0.1252790305]'
+ #keys: '[415136.0.1307935338]'
BaseType: 'WebDateSelector'
Properties:
[
@@ -30,6 +30,6 @@
Properties:
[
Orientation: 'horizontal'
- Taborder: 3
+ Taborder: 0
]
}
--
Gitblit v1.9.3