Merge branch 'dev'

renhao

2023-10-12 df6e56c65e758b5a5e7b28bb9192575710a76c47

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupSalesViews#633.def

@@ -18,5 +18,27 @@
        Taborder: 3
      ]
    }
    Component ButtonPriority
    {
      #keys: '[414382.0.587601840]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'QUEUE'
        Label: '优先级因子'
        Taborder: 4
      ]
    }
    Component ButtonOffsetting
    {
      #keys: '[414702.1.20970764]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'PRICE_STICKER'
        Label: '冲减'
        Taborder: 5
      ]
    }
  ]
}