Merge branch 'wangsx' into 105

Conflicts:
	khdo/src/main/java/com/bootdo/BootdoApplication.java

khdo/src/main/java/com/bootdo/BootdoApplication.java

@@ -20,5 +20,6 @@ public class BootdoApplication {
     public static void main(String[] args) {
     public static void main(String[] args) {
         SpringApplication.run(BootdoApplication.class, args);
         SpringApplication.run(BootdoApplication.class, args);
         System.out.println("启动咯，wangsx333........");
         System.out.println("启动咯，wangsx333........");
+        System.out.println("启动咯，wangsx222........");
     }
     }
 }
 }