Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -320,7 +320,7 @@
         newldrs.reservation_id = #{reservationId} ANd newldrs.stock_list_status != 2 AND
         FIND_IN_SET(newldrs.stocklist_id,t.aaa))
         AS planNum,
-        GROUP_CONCAT(DISTINCT IF(ldslNew.source_type = 1,t1.allocation_ids,t2.allocation_ids)) AS allocations,
+        GROUP_CONCAT(DISTINCT IF(ldslNew.source_type = 1,t1.allocation_ids,t2.allocation_ids)) AS allocations
         FROM
         (
         SELECT
@@ -342,7 +342,6 @@
         ) t
         LEFT JOIN logpm_distribution_stock_list ldslNew ON t.cargo_number = ldslNew.cargo_number and ldslNew.quantity_stock !=0
         LEFT JOIN logpm_distribution_stock ldss ON FIND_IN_SET(ldss.stock_list_id,t.aaa)
-
         LEFT JOIN (
         SELECT
         ldpl.material_code,