Merge branch 'b1'

# Conflicts:
#	src/main/java/com/subsidy/MeishuApplication.java

src/main/java/com/subsidy/MeishuApplication.java

@@ -20,9 +20,8 @@ public class MeishuApplication {
     public static void main(String[] args) {
     public static void main(String[] args) {
         SpringApplication.run(MeishuApplication.class, args);
         SpringApplication.run(MeishuApplication.class, args);
         System.out.println("master...........");
         System.out.println("master...........");
-        System.out.println("bbbbbbb");
-        System.out.println("测试分支合并");
-        System.out.println(22222222);
+        System.out.println("b1");
+
     }
     }