Merge branch 'master' into 测试

src/views/production/shipment/print-order/unpack.vue

@@ -12,12 +12,12 @@
               </template>
             </el-table-column>
             <el-table-column label="剩余可装箱数" prop="surplusQuantity" align="center" width="110" />
-            <el-table-column label="净重（g）" width="120">
+            <el-table-column label="数量" width="120">
               <template #default="{ row }">
                 <el-input-number
                   onmousewheel="return false;"
                   v-model="row.quantity"
-                  placeholder="净重"
+                  placeholder="数量"
                   style="width: 100%"
                   :controls="false"
                   :min="0"