From 42e52dd7a48775cd83be92cc46ea42aa124cb15c Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 14 六月 2024 13:06:19 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def | 16 ++++++----------
1 files changed, 6 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..576fb69 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
@@ -12,6 +12,12 @@
#child: ActionBarPageData
#child: ActionBarPageSales
#child: applicationConfigureActionBarPageDef
+ #child: ActionBarPageInventory
+ #child: ActionBarPageRestraint
+ #child: ActionBarPageScenarioSelection
+ #child: applicationFixedPageActionBarPageDef
+ #child: applicationDevelopmentActionBarPageDef_1
+ #child: abpAlgorithmPostProcessing
]
}
Component dhBinaryDataPR id:dhBinaryDataPR_688
@@ -172,16 +178,6 @@
Properties:
[
Taborder: 51
- ]
- }
- Component dhCalendarUse
- {
- #keys: '[415136.0.667561067]'
- BaseType: 'WebDataHolder'
- Databinding: 'LibCal_Calendar'
- Properties:
- [
- Taborder: 56
]
}
]
--
Gitblit v1.9.3