Merge branch 'dev' into dev_hrh_global

haorenhui

2023-10-25 4269bd7e29b525a0e97e7283d2688e26df87b9f2

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditIssueWorkOrder/Component_pnlContent.def

@@ -77,8 +77,8 @@
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'GlobalOTDTable'
            Source: 'GlobalOTDTable'
            DataType: 'GlobalOTDSOP'
            Source: 'GlobalOTDSOP'
            Taborder: 0
            Transformation: 'WorkOrderType'
          ]