Merge branch 'dev' into dev_user0622

# Conflicts: # mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
2026-07-02 19:09:31 +08:00
parent 0d70cc8b4c c2a4b981e6
commit 176bdbc633
30 changed files with 858 additions and 246 deletions
@@ -99,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        b.common,
        b.pack_id,
        b.pack_code,
+        b.SPECIFICATION_MODEL,
        b.pack_name
    </sql>