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

hongji.li

2023-10-18 35dd5276733a04cf5b964b4359fc059e79eaa9a5

 _Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/_ROOT_Component_FormMaterialLabelingAndPlanningStrategy.def

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