Merge branch 'pre-production'

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml

@@ -136,11 +136,11 @@
 
         <select id="selectAllocationInfo" resultType="com.logpm.basicdata.vo.WarehouseAllocationInfoVO">
         SELECT
-        lwga.qr_code as allocationCode,
+        lwga.id as allocationCode,
         CONCAT(lwgs.goods_shelf_name,'-',lwga.goods_allocation_name) as allocationName,
         lww.`name` as warehouseName,
         lwga1.headline as areaName,
-        lwga.id as allocationId
+        lwga.qr_code as allocationId
          from logpm_warehouse_goods_allocation lwga
         LEFT JOIN logpm_warehouse_goods_area lwga1 ON lwga1.id=lwga.goods_area_id
         LEFT JOIN logpm_warehouse_goods_shelf lwgs ON lwgs.id = lwga.goods_shelf_id