Commit 421a9f6e authored by zhangsen's avatar zhangsen

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

parents b7ca2deb 8b777360
...@@ -65,3 +65,6 @@ amos.system.user.user-name=hygf_admin ...@@ -65,3 +65,6 @@ amos.system.user.user-name=hygf_admin
amos.system.user.password=a1234567 amos.system.user.password=a1234567
amos.system.user.product=AMOS_STUDIO_WEB amos.system.user.product=AMOS_STUDIO_WEB
amos.system.user.app-key=AMOS_STUDIO amos.system.user.app-key=AMOS_STUDIO
workflow.feign.name=AMOS-API-WORKFLOW
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment