Merge branch 'dev' into pre-production

blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/FactoryDataServiceImpl.java

@@ -133,6 +133,7 @@ public class FactoryDataServiceImpl implements FactoryDataService {
 					entity.setDeliveryNoteId(vo.getId().toString());
 					entity.setLogId(ObjectUtil.isNotEmpty(logId) ? logId.toString() : null);
 					entity.setTenantCode(AuthUtil.getTenantId());
+					entity.setOrderType(vo.getOrderType());
 					packageInfoEntities.add(entity);
 				}
 				packageInfoService.saveBatch(packageInfoEntities);