From d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86 Mon Sep 17 00:00:00 2001
From: yanweiyuan3 <yanweiyuan3@gmail.com>
Date: 星期二, 10 十月 2023 17:45:58 +0800
Subject: [PATCH] Merge branch 'dev' into dev_yy

---
 _Main/UI/MacroPlanner/Component_ApplicationLibMacroPlanner/Component_mbMainMenu.def |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/_Main/UI/MacroPlanner/Component_ApplicationLibMacroPlanner/Component_mbMainMenu.def b/_Main/UI/MacroPlanner/Component_ApplicationLibMacroPlanner/Component_mbMainMenu.def
index 6055329..4ad9e84 100644
--- a/_Main/UI/MacroPlanner/Component_ApplicationLibMacroPlanner/Component_mbMainMenu.def
+++ b/_Main/UI/MacroPlanner/Component_ApplicationLibMacroPlanner/Component_mbMainMenu.def
@@ -13,6 +13,10 @@
           [
             Component MenuSpecial #extension
             {
+              Children:
+              [
+                Component MenuGlobalOTDTableTest { #keys: '[157968.0.1170224128]' BaseType: 'Menu' Properties: [ Image: 'DUDE2' Text: 'GlobalOTDTable Test' ] }
+              ]
               Properties:
               [
                 ModeledStringList ChildOrdering
@@ -30,6 +34,7 @@
                   c: MenuTest
                   c: MenuScenarioManagerTest
                   c: MenuMPDomainHandlerTest
+                  c: MenuGlobalOTDTableTest
                   c: MenuRemoveHistory
                   c: Menu46
                   c: MenuRefresh
@@ -78,6 +83,8 @@
           ]
         }
         Component MenuDoSync { #keys: '[414384.0.605664172]' BaseType: 'Menu' Properties: [ Image: 'CLOUD_DOWNLOAD' Text: 'DoSync' ] }
+        Component menuSeparator506 { #keys: '[414702.0.137524309]' BaseType: 'Menu' Properties: [ Separator: true ] }
+        Component ComponentMenuAnalysisGlobalOTDTable { #keys: '[414702.0.137524953]' BaseType: 'ComponentMenu' Properties: [ ComponentType: 'frmStandardAnalysisGlobalOTDTable' Text: '' ] }
       ]
       Properties:
       [
@@ -94,6 +101,8 @@
           c: Menu8
           c: MenuSelectDemoDataset
           c: MenuDoSync
+          c: menuSeparator506
+          c: ComponentMenuAnalysisGlobalOTDTable
         }
       ]
     }
@@ -126,5 +135,36 @@
         }
       ]
     }
+    Component menuFile #extension
+    {
+      Children:
+      [
+        Component menuSeparator457 { #keys: '[414702.0.265704251]' BaseType: 'Menu' Properties: [ Separator: true ] }
+        Component ComponentMenu666 { #keys: '[414702.0.265704260]' BaseType: 'ComponentMenu' Properties: [ ComponentType: 'FormBrokerExecuteLog' Text: '' ] }
+        Component menuSeparator822 { #keys: '[414702.0.340555024]' BaseType: 'Menu' Properties: [ Separator: true ] }
+        Component ComponentMenu783 { #keys: '[414702.0.340555035]' BaseType: 'ComponentMenu' Properties: [ ComponentType: 'FormTestButtonCollection' Text: '' ] }
+      ]
+      Properties:
+      [
+        ModeledStringList ChildOrdering
+        {
+          c: ComponentMenu3
+          c: Menu9
+          c: menuBroadcastMessage
+          c: menuQuintiqChat
+          c: Menu10
+          c: menuChangePassword
+          c: Menu11
+          c: menuLoadReport
+          c: Menu13
+          c: MenuRestart
+          c: menuExit
+          c: menuSeparator457
+          c: ComponentMenu666
+          c: menuSeparator822
+          c: ComponentMenu783
+        }
+      ]
+    }
   ]
 }

--
Gitblit v1.9.3