This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git.
from 0da9e97 2.7.x (#742) add c1ff0a2 Merge to master (#724) add ec32800 Merge branch 'master' into 2.7.x No new revisions were added by this update. Summary of changes: .../config/ServiceBeanIdConflictProcessor.java | 115 +++++++++++++++++++++ .../servlet-container-samples/pom.xml | 1 + 2 files changed, 116 insertions(+) create mode 100644 dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/ServiceBeanIdConflictProcessor.java