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

lihongji

2024-11-07 7da84821eb07cfa1370adfe4144e41416cf1cefa

 _Main/UI/MacroPlannerWebApp/Component_FormCCEngineLogisticsCostReport/Component_MatrixEditorTable#358.def

@@ -26,9 +26,9 @@
      ]
      Properties:
      [
        Attributes: 'Value'
        Column: 'FinancialProductionColumn'
        Row: 'FinancialProductionRow'
        Attributes: 'RentInCost;RentOutOfCost;WerkToRentTransCost;RentStorCost;EstimateTotalCost;CoefficientValue;AllCost'
        Column: 'Column'
        Row: 'Row'
        Taborder: 0
      ]
    }