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

lihongji

2024-08-14 d0d4a34072977d5194fb981a23fce67ba1b7eae2

 _Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Component_pCurve.def

@@ -11,7 +11,6 @@
      BaseType: 'WebEditField'
      Properties:
      [
        Enabled: false
        NumberOfColumns: 60
        Taborder: 1
      ]
@@ -33,6 +32,7 @@
      BaseType: 'WebLabel'
      Properties:
      [
        Label: 'Curve'
        NumberOfColumns: 0
        Taborder: 0
      ]