Merge branch 'b1'

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

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

@@ -19,7 +19,7 @@ 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("b1分支");
 
 
     }
     }