合并代码，解决冲突

zhangchao

2024-11-02 c51ab886ca899243f36cffe6c1a86d19057d44f5

 src/main/webapp/views/picking/picking.html

@@ -197,7 +197,7 @@
        </tr>
        <tr style="height: 30px; font-size: 15px;">
            <td align="left" scope="col" colspan="1" style="width: 100px;">
                料箱码:
                货架码:
            </td>
            <td align="left" scope="col" colspan="1">
                {{this.containerCode}}