Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-04-21 1c15ef9287dced4bbde0c5e88b91eec2d375382c

 src/views/basicData/materialManagement/index.vue

@@ -96,7 +96,6 @@
    formatter: (({ cellValue, row, column }) => {
      if (cellValue) {
        for(let i=0;i<aps_material_status.value.length;i++){

          if(cellValue===aps_material_status.value[i].value){
            return aps_material_status.value[i].label
          }