Merge branch 'master' of https://github.com/ipipman/JavaSpringBootSamples

ipipman · ipipman · commit 17f263e1e330 · 2021-02-22T15:22:25.000+08:00
Conflicts:
	README.md
diff --git a/README.md b/README.md
@@ -38,4 +38,10 @@
 - ##### [SpringCloud集成Nacos+Ribbon框架-实现注册中心和负载均衡;](https://github.com/ipipman/JavaSpringBootSamples/tree/master/springcloud-nacos-ribbon-sample "SpringCloud集成Nacos+Ribbon框架-实现注册中心和负载均衡")
 
 ### 关于作者
+<<<<<<< HEAD
+=======
+- test
+- 22
+- xiaofangmoon
+>>>>>>> a22a77545ddb72fe452b5fc640bafc9aad4fcc36
 
