From 4e81774a232b45a6a9df3dfd06893c481c83695d Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期三, 07 八月 2024 15:56:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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..2a93db6 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
@@ -174,11 +183,11 @@
Taborder: 51
]
}
- Component dhCalendarUse
+ Component dhSelectedShiftDay
{
- #keys: '[415136.0.667561067]'
+ #keys: '[413988.0.1371211822]'
BaseType: 'WebDataHolder'
- Databinding: 'LibCal_Calendar'
+ Databinding: 'ShiftDay'
Properties:
[
Taborder: 56
--
Gitblit v1.9.3