Merge remote-tracking branch 'origin/dev1234' into dev1234

xiangmu/src/main/java/org/example/aaaa.java

@@ -2,6 +2,6 @@ package org.example;
 
 public class aaaa {
     public static void main(String[] args) {
-        System.out.println("hello world第1234次");
+        System.out.println("hello wo次");
     }
 }