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

lazhen

2024-11-27 f8591b57ef2500daaa4f2ca959e99bc28a5d1d42

 _Main/UI/MacroPlannerWebApp/Component_FormMachineLogisticsCostReport/Component_MatrixEditor912.def

@@ -56,7 +56,7 @@
      Properties:
      [
        Legend: 'Category'
        SortCriteria: 'Category'
        SortCriteria: 'Index;Category'
        Taborder: 1
      ]
    }
@@ -81,7 +81,7 @@
      ]
      Properties:
      [
        Legend: 'StartDate'
        Legend: 'DisplayName'
        SortCriteria: 'StartDate'
        Taborder: 2
      ]