Merge branch 'master' of http://120.46.222.128:10021/elink-star/esua-epdc-cloud

# Conflicts: # esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
修改子模块文件
4 changed files with 4 additions and 4 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -6,4 +6,4 @@
 	url = http://120.46.222.128:10021/elink-star/epdc-cloud-gateway-shibei.git
 [submodule "esua-epdc/epdc-cloud-commons-shibei"]
 	path = esua-epdc/epdc-cloud-commons-shibei
-	url = http://120.46.222.128:10021/elink-star/epdc-cloud-commons-shibei.git
+	url = http://120.46.222.128:10021/elink-star/epdc-cloud-commons-shibei.git
--- a/esua-epdc/epdc-cloud-commons-shibei
+++ b/esua-epdc/epdc-cloud-commons-shibei
@ -1 +1 @@
-Subproject commit 6ce4c3d35f0cfb0d915e5c291f9e36155007a393
+Subproject commit 760b973de2bbc58874c4a2ce6ac82d4d436ceecb
--- a/esua-epdc/epdc-cloud-gateway-shibei
+++ b/esua-epdc/epdc-cloud-gateway-shibei
@ -1 +1 @@
-Subproject commit 89021d5b3e35ad1d3be88a03e19de146df5a0d70
+Subproject commit b9ed9d8d4489f6cd87f2d1e5152bbf206c831dfb
--- a/esua-epdc/epdc-cloud-parent-shibei
+++ b/esua-epdc/epdc-cloud-parent-shibei
@ -1 +1 @@
-Subproject commit 71857553cfca23b808dadbe177d8391509a50cbd
+Subproject commit 418503b89e892d5f7279c2a52c6aad38da1544d9
Author	SHA1	Message	Date
荣超	425e8e045d	Merge branch 'master' of http://120.46.222.128:10021/elink-star/esua-epdc-cloud # Conflicts: # esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml	2 years ago
荣超	458997c8fa	修改子模块文件	2 years ago