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_FrmOrderResult/_ROOT_Component_FrmOrderResult.def

@@ -39,6 +39,7 @@
  Properties:
  [
    Description: '订单冲减过程及订单标签展示'
    Image: 'NAV_REDO_LIGHT_BLUE'
    Title: '订单冲减过程及订单标签展示'
  ]
}