Merge remote-tracking branch 'origin/developer' into developer

# Conflicts: # gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceApiServiceImpl.java

Merge remote-tracking branch 'origin/developer' into developer
# Conflicts: # gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceApiServiceImpl.java
63d1136c · guojuxing · 9eabf091 · e2d2bec4 · 63d1136c
Commit 63d1136c authored Dec 24, 2019 by guojuxing
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

ResourceApiServiceImpl.java ...m/gic/auth/service/outer/impl/ResourceApiServiceImpl.java +0 -0

No files found.
--- a/gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceApiServiceImpl.java
+++ b/gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceApiServiceImpl.java