Merge branch 'dev' into pre-production

blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/config/FactoryDataOloConfiguration.java

@@ -18,6 +18,7 @@ package com.logpm.factorydata.olo.config;
 
 
 import com.logpm.factorydata.olo.pros.FactoryDataOloProperties;
+import com.logpm.factorydata.olo.pros.OldProperties;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -33,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
 @ComponentScan({"org.springblade", "com.logpm"})
 @EnableFeignClients({"org.springblade", "com.logpm"})
 @MapperScan({"org.springblade.**.mapper.**", "com.logpm.**.mapper.**"})
-@EnableConfigurationProperties(FactoryDataOloProperties.class)
+@EnableConfigurationProperties(value = {FactoryDataOloProperties.class, OldProperties.class})
 public class FactoryDataOloConfiguration {