我测试一下分支合并功能

chapter6/config-server/src/main/java/com/forezp/ConfigServerApplication.java

@@ -12,4 +12,8 @@ public class ConfigServerApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(ConfigServerApplication.class, args);
 	}
+
+	public void test() {
+		System.out.println(1);
+	}
 }