Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/views/basic/workplace/workplaceQueue.vue

@@ -130,9 +130,10 @@
         <el-table-column label="出货槽编号" prop="code" show-overflow-tooltip width="160"></el-table-column>
         <!--<el-table-column label="货架名称" prop="name" show-overflow-tooltip width="160"></el-table-column>-->
         <!--<el-table-column label="产品ID" prop="relId" show-overflow-tooltip width="160"></el-table-column>-->
+        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip width="160"></el-table-column>
         <el-table-column label="制剂规格" prop="prepnSpec" show-overflow-tooltip width="120"></el-table-column>
         <el-table-column label="包装规格" prop="ggxh" show-overflow-tooltip width="120"></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip width="160"></el-table-column>
+
 
         <el-table-column label="灯组标签" prop="mac" show-overflow-tooltip width="160"></el-table-column>
         <el-table-column label="所属取货架编号" prop="freightCode" show-overflow-tooltip width="160"></el-table-column>