From b99e22c06c023b82d5062fee06e2f8a29ce04977 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期四, 24 十月 2024 17:22:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelDemandComparison#634.def | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelDemandComparison\043634.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelDemandComparison\043634.def"
index 6793023..55668a9 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelDemandComparison\043634.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelDemandComparison\043634.def"
@@ -38,10 +38,10 @@
]
Properties:
[
- Taborder: 3
+ Taborder: 4
]
}
- Component dhFinelProduct
+ Component dhFinelProducts
{
#keys: '[412672.1.61940686]'
BaseType: 'WebDataHolder'
@@ -73,7 +73,7 @@
]
Properties:
[
- Taborder: 4
+ Taborder: 5
]
}
Component dhCheckUnits id:dhCheckUnits_21
@@ -98,7 +98,17 @@
]
Properties:
[
- Taborder: 5
+ Taborder: 6
+ ]
+ }
+ Component dhFinalUnits id:dhFinalUnits_90
+ {
+ #keys: '[414996.1.156002816]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'structured[Entity]*'
+ Properties:
+ [
+ Taborder: 3
]
}
]
--
Gitblit v1.9.3