Merge branch 'master' into dev

hx-sale/src/main/resources/mapper/pack/PackDetailMapper.xml

@@ -30,7 +30,7 @@
                      sum( t1.bom_volume*t1.pack_quantity )                 bomVolume,
                      t1.shipment_status,
                      t1.shipment_time,
-                     t1.contract_ids
+                     GROUP_CONCAT(DISTINCT t1.contract_ids) AS contractIds
               FROM pack_detail t1
               GROUP BY t1.pack_id
               ORDER BY t1.create_time desc) pd