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

hongji.li

2023-11-03 aefafd2142478d4fb07d6b8b45c3047e247389e0

 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTianHua/_ROOT_Component_FormPanelMaterialTianHua.def

@@ -32,8 +32,8 @@
  ]
  Properties:
  [
    Description: '天花'
    Description: '天华'
    Image: 'CANDLE'
    Title: '天花'
    Title: '天华'
  ]
}