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

lihongji

2024-08-14 d0d4a34072977d5194fb981a23fce67ba1b7eae2

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def

@@ -16,15 +16,13 @@
        Taborder: 0
      ]
    }
    Component bPackagingPlan
    Component bBlank
    {
      #keys: '[413988.0.1291640400]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'SIXPACK_BEER'
        Label: 'Packaging plan'
        Taborder: 3
        Taborder: 5
      ]
    }
    Component bOfflinePlan
@@ -50,12 +48,25 @@
        Taborder: 2
      ]
    }
    Component btnSecondDevelopmentPlan
    Component bPackagingPlan
    {
      #keys: '[413988.0.1400700646]'
      #keys: '[413988.0.1291640400]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'SIXPACK_BEER'
        Label: 'Packaging plan'
        Taborder: 3
      ]
    }
    Component bShippingActualData
    {
      #keys: '[415136.0.905520117]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'TABLE_CONNECTION'
        Label: 'Shipping data'
        Taborder: 4
      ]
    }