Merge branch 'dev_cyy' into dev

hongji.li

2023-09-24 2709b3e28de35a866a65fa72f589d38a43d5045b

 _Main/UI/MacroPlannerWebApp/Component_FormPRHistoryData/Component_PanelPRHistoryButton.def

@@ -5,7 +5,7 @@
  BaseType: 'WebPanel'
  Children:
  [
    Component ButtonResendPRA
    Component ButtonResendPR
    {
      #keys: '[414384.0.799483157]'
      BaseType: 'WebButton'
@@ -16,6 +16,17 @@
        Taborder: 0
      ]
    }
    Component ButtonExportPRHistory
    {
      #keys: '[414384.0.859111744]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'EXPORT1'
        Label: '数据导出'
        Taborder: 1
      ]
    }
  ]
  Properties:
  [