Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

lazhen

2024-10-14 cb304bf64fc6da151319b3f07c8327adb45e35dd

 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def

@@ -46,7 +46,7 @@
          [
            DataType: 'LocalTable'
            FilterArguments: 'checkedProduct:QMacroPlanner::FormDemandComparison.dhFinelProduct'
            FixedFilter: 'exists( checkedProduct,Elements,product,product.ID() = object.Name() )'
            FixedFilter: 'exists( checkedProduct,Elements,product,product.ID() = object.ProductID())'
            Source: 'dhComparisonData'
            Taborder: 0
            Transformation: 'LocalRow'