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

lazhen

2024-07-19 a60bc0ce9e2df0195e6ea6aa0c86f0e72353543b

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def

@@ -22,6 +22,8 @@
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'SIXPACK_BEER'
        Label: 'Packaging plan'
        Taborder: 3
      ]
    }
@@ -48,6 +50,15 @@
        Taborder: 2
      ]
    }
    Component btnSecondDevelopmentPlan
    {
      #keys: '[413988.0.1400700646]'
      BaseType: 'WebButton'
      Properties:
      [
        Taborder: 4
      ]
    }
    Component bShippingActualData
    {
      #keys: '[415136.0.905520117]'
@@ -56,7 +67,7 @@
      [
        Image: 'TABLE_CONNECTION'
        Label: 'Shipping data'
        Taborder: 4
        Taborder: 5
      ]
    }
  ]