Commit 494debff by 涂亚平

Merge branch 'b1'

# Conflicts:
#	src/main/java/com/subsidy/MeishuApplication.java
2 parents 1c9744e2 216dfabb
......@@ -20,9 +20,8 @@ public class MeishuApplication {
public static void main(String[] args) {
SpringApplication.run(MeishuApplication.class, args);
System.out.println("master...........");
System.out.println("bbbbbbb");
System.out.println("测试分支合并");
System.out.println(22222222);
System.out.println("b1");
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!