Merge branch 'dev' of https://gitee.ltd/pig/pigx into dev

# Conflicts:
#	pigx-config/src/main/resources/config/pigx-codegen-dev.yml
This commit is contained in:
冷冷 committed 2018-10-24 21:31:48 +08:00
commit 58d8f245e5
25 files changed
+178 -83

No files matched your search

@@ -20,4 +20,4 @@ eureka:
prefer-ip-address: true
client:
service-url:
defaultZone: http://pig:pig@localhost:1025/eureka/
defaultZone: http://pig:pig@lengleng:1025/eureka/