Merge remote-tracking branch 'origin/main'

# Conflicts:
#	out/production/hospital-SpringProject/com/ssm/first/TestFirst.class

hospital-MyBatisProject/src/com/ssm/test/Test.java

@@ -4,7 +4,7 @@ import java.io.IOException;
 public class Test {
 
 	public static void main(String[] args) throws IOException {
-
+		System.out.print("Hello Spring!");
 	}
 }
 

hospital-SpringProject/src/com/ssm/first/TestFirst.java

@@ -1,14 +1,15 @@
 package com.ssm.first;
 
-import javafx.application.Application;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
 public class TestFirst {
 public static void main(String[] args) {
 	//1.初始化Spring容器，加载配置文件
-    ApplicationContext ac = new ClassPathXmlApplicationContext("bean-first.xml");
-    System.out.println("Hello Spring!");
-    System.out.println("Hello New Spring!");
+
+
+
+
+
+
+
+   System.out.println("hello 123java");
 }
 }