Merge branch 'dev_cyy' into dev

hongji.li

2023-09-24 2709b3e28de35a866a65fa72f589d38a43d5045b

 _Main/UI/MacroPlannerWebApp/Component_FormHedgingOfLog/_ROOT_Component_FormHedgingOfLog.def

@@ -8,16 +8,8 @@
  Children:
  [
    #child: PanelHedgingOfLog
    Component lb_ForecastQty
    {
      #keys: '[414724.0.31031550]'
      BaseType: 'WebLabel'
      Properties:
      [
        Taborder: 1
        Text: '原材料的预测数量：0'
      ]
    }
    #child: PanelHedgingOfLog221
    #child: PanelHedgingOfLog593_93
  ]
  Properties:
  [