Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-10 d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86

 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/_ROOT_Component_FormPanelMaterialTianHua.def

@@ -8,11 +8,32 @@
  Children:
  [
    #child: ListPanelMaterialTianHua
    Component DataHolderPanelTianHua
    {
      #keys: '[414702.0.211890769]'
      BaseType: 'WebDataHolder'
      Databinding: 'PanelMaterialAll'
      Properties:
      [
        Taborder: 0
      ]
    }
    Component LabelLastSent id:LabelLastSent_662
    {
      #keys: '[414702.0.211781782]'
      BaseType: 'WebLabel'
      Properties:
      [
        DataBinding: 'DataHolderPanelTianHua.Data.ReleaseDate'
        Label: '上次发送时间：'
        Taborder: 1
      ]
    }
  ]
  Properties:
  [
    Description: '天花'
    Description: '天华'
    Image: 'CANDLE'
    Title: '天花'
    Title: '天华'
  ]
}