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

limj

2023-10-07 8d37eebd5b4e52c12b25e90ca7ce59439798f14e

 _Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/_ROOT_Component_FormMaterialLabelingAndPlanningStrategy.def

@@ -13,6 +13,6 @@
  [
    Description: '物料标签&计划策略表单'
    Image: 'PAPER_ROLL'
    Title: 'Material labeling&planning strategy'
    Title: '物料标签&计划策略'
  ]
}