From 30c02e0c981b16be0918483543f4b812956c45d4 Mon Sep 17 00:00:00 2001
From: Lai,Risheng <risheng.lai@capgemini.com>
Date: 星期四, 02 十一月 2023 10:50:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev'
---
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def
index 4a5d5b5..6d1c1b0 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def
@@ -13,7 +13,7 @@
[
Image: 'WATER_FISH'
Taborder: 0
- Title: '浜ц兘鍒嗛厤&濉骇'
+ Title: '浜ц兘鍒嗛厤'
]
}
Component mnAnnualProductionAndSalesReview
@@ -22,8 +22,8 @@
BaseType: 'WebMenu'
Properties:
[
- Image: 'PIG'
- Taborder: 5
+ Image: 'LEMONADE_GLASS'
+ Taborder: 6
Title: '骞村害浜ч攢澶嶇洏'
]
}
@@ -49,14 +49,14 @@
Title: '闈㈡澘鎷夋枡_闆嗗洟鎿嶄綔'
]
}
- Component mn224
+ Component mn222
{
#keys: '[414702.1.5593849]'
BaseType: 'WebMenu'
Properties:
[
Separator: true
- Taborder: 4
+ Taborder: 5
]
}
Component mnDockingERPForPRRelease
@@ -70,6 +70,39 @@
Title: '瀵规帴ERP杩涜PR閲婃斁'
]
}
+ Component mnDataDistribution
+ {
+ #keys: '[414702.1.155392180]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'PALM_TREE'
+ Taborder: 4
+ Title: '鏁版嵁鍒嗗彂'
+ ]
+ }
+ Component mn666
+ {
+ #keys: '[414702.1.293023106]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Separator: true
+ Taborder: 7
+ ]
+ }
+ Component mnPeggingAnalyse
+ {
+ #keys: '[414702.1.293023171]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Description: 'Pegging鍒嗘瀽'
+ Image: 'COCKTAIL'
+ Taborder: 8
+ Title: 'Pegging鍒嗘瀽'
+ ]
+ }
]
Properties:
[
--
Gitblit v1.9.3