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

lazhen

2024-07-29 6715f79ffe09dcac0157fa189b4d37844ee1d863

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def

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