Merge remote-tracking branch 'origin/master'

data-common/src/main/java/com/bailuntec/mapper/DcMidTransitMapper.xml

@@ -736,6 +736,7 @@
           and bailun_interception_status in('None','Failed')
           and warehouse_code != ''
           and platform_type != 'FBA'
+          and company_id = 1
           and has_delete = 0
           and has_scalp = 0
           and has_fba_s = 0

data-mid/mid-calculate-transit/Dockerfile

@@ -20,4 +20,4 @@ RUN cd /usr/app/data-parent && mvn -T 1C install  -pl ../data-mid/mid-calculate-
 
 #指定容器启动程序及参数   <ENTRYPOINT> "<CMD>"
 EXPOSE 8080
-ENTRYPOINT ["java","-Xms30m","-Xmx80m","-jar","/usr/app/data-mid/mid-calculate-transit/target/mid-calculate-transit-1.0-SNAPSHOT.jar"]
+ENTRYPOINT ["java","-Xms30m","-Xmx600m","-jar","/usr/app/data-mid/mid-calculate-transit/target/mid-calculate-transit-1.0-SNAPSHOT.jar"]
\ No newline at end of file