# Conflicts: # blade-example-api/blade-dubbo-provider-api/pom.xml # blade-example-api/pom.xml # blade-example/blade-dubbo-consumer/pom.xml # blade-example/blade-dubbo-provider/pom.xml # blade-example/blade-easypoi/pom.xml # blade-example/blade-mq-kafka/pom.xml # blade-example/blade-mq-rabbit/pom.xml # blade-example/blade-sharding-jdbc/pom.xml # blade-example/blade-sharding-jdbc/src/main/java/org/springblade/sharding/config/ShardingConfiguration.java # blade-example/blade-sharding-jdbc/src/main/resources/application-prod.yml # blade-example/blade-sharding-jdbc/src/main/resources/application-test.yml # blade-example/blade-stream-consumer/pom.xml # blade-example/blade-websocket/pom.xml # blade-example/pom.xml # blade-service-api/logpm-basicdata-api/pom.xml # blade-service-api/logpm-factory-api/pom.xml # blade-service/logpm-aftersales/pom.xml # blade-service/logpm-aftersales/src/main/resources/liteflow/demo.el.xml # blade-service/logpm-basic/pom.xml # blade-service/logpm-basic/src/main/java/com/logpm/basic/LiteFlowTest.java # blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicPdaClient.java # blade-service/logpm-statisticsdata/pom.xml # blade-service/logpm-trunkline/pom.xml # blade-service/pom.xml # pom.xml