From 13c4f4920ece7b0060ec51e2510acf98f28abe90 Mon Sep 17 00:00:00 2001
From: rislai <risheng.lai@capgemini.com>
Date: 星期二, 25 六月 2024 18:15:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
index 3e7a868..e01fbb6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
@@ -12,6 +12,15 @@
#child: ActionBarPageData
#child: ActionBarPageSales
#child: applicationConfigureActionBarPageDef
+ #child: ActionBarPageInventory
+ #child: ActionBarPageRestraint
+ #child: ActionBarPageScenarioSelection
+ #child: applicationFixedPageActionBarPageDef
+ #child: applicationDevelopmentActionBarPageDef_1
+ #child: abpAlgorithmPostProcessing
+ #child: ActionBarPagePlan
+ #child: ActionBarPageReport
+ #child: ActionBarPageScenarioComparison
]
}
Component dhBinaryDataPR id:dhBinaryDataPR_688
@@ -172,16 +181,6 @@
Properties:
[
Taborder: 51
- ]
- }
- Component dhCalendarUse
- {
- #keys: '[415136.0.667561067]'
- BaseType: 'WebDataHolder'
- Databinding: 'LibCal_Calendar'
- Properties:
- [
- Taborder: 56
]
}
]
--
Gitblit v1.9.3