Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-16 d10671cc1821707c11e466c7a982a6dbfa6442a0

 _Main/UI/MacroPlanner/Component_FormManufactureLTImputation/Component_ListManufactureLTImputation.def

@@ -66,7 +66,7 @@
      BaseType: 'GUIDataSetLevel'
      Properties:
      [
        Columns: 'ManufactureLTImputationColumns'
        Columns: 'MacroPlanColumns'
        DataExtractor: 'GUIDataExtractor689'
        PosX: 35
        PosY: 30