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

# Conflicts:
#	src/main/resources/application-dev.yml

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -901,7 +901,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                 ThrOrderUploadBustypesEntity thrOrderUploadBustypesEntity = thrOrderUploadBustypesService.findByAction(orderEntity.getAction());
                 if (thrOrderUploadBustypesEntity == null) {
                     log.error(billNo + ":" + orderEntity.getAction() + "单据类型未设置自动上传");
-                    return ResultVOUtils.error(500, billNo + ":" + orderEntity.getAction() + "单据类型未设置自动上传");
+                    continue;
                 }
                 if (!thrOrderUploadBustypesEntity.getOrderSource().contains(orderEntity.getFromType() + "")) {
                     log.error(billNo + ":" + "单据来源不允许自动提交");

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari: