Merge branch 'master' into dev

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -2000,7 +2000,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 }
             }
             //如果订单类型为11 当订单大于截止日期时，不显示订单
-            if(orderType == 11){
+            if(orderType == 11 || orderType == 21){
                 int result = omstruckOrderSeparateMapper.getInward(orderMesMap.get("orderId"));
                 if(result == 0){
                     omstruckOrderMapper.closeTruckOrder(DataChange.dataToBigDecimal(orderMesMap.get("orderId")));

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/oms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8