Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-11-11 a67dc2f0b8dd2803982cfa9c6ea42b77c191d22c

 _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'