Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-26 830461b340837471a8fff6eabc7145f8d544b4ad

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