Merge remote-tracking branch 'origin/dev' into pre-production

1 month ago · 7cee50efd3
1 changed files with 1 additions and 1 deletions
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@ -1655,7 +1655,7 @@
        logpm_distribution_stock AS ldss
        WHERE
        ldss.is_deleted = 0
-        ldss.cancel_status != 1
+        and ldss.cancel_status != 1
        AND ldss.reservation_id = ldbl.id
        ) AS scanNum,
        (