From fbf6a877aae46e19a8d3c0058cefa3f81c72715f Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 27 Nov 2020 18:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
index 39f2b2f..a6da7f1 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -226,8 +226,16 @@
- /api-evaluation/evaluationxrayinfo/appUpload
- /api-evaluation/evaluationxrayinfo/appSave
- /api-file/baseUplaod
+ - /api-file/feignUploadHosIdAndDepId
- /api-user/users/python
- /api-evaluation/evaluationxrayinfo/checkQRCode
+ - /api-opration/wxController/callback
+ - /api-opration/alipay/notify
+ - /api-opration/alipay/return
+ - /api-record/DiagnosticUnfinishedFegin/equipmentList
+ - /api-record/DiagnosticUnfinishedFegin/equipmentUpload
+ - /api-opration/wxController/getOpenId
+ - /api-record/DiagnosticUnfinishedFegin/recordChildInterworking
# - /api-user/syshospital/findAllByMap
# - /api-user/sysdictionaries/findAll
# - /api-user/sysdepartment/findListByHospitalId
@@ -255,13 +263,21 @@
/api-file/smsChangLan/send,
/api-user/users/doctorUserReg,
/api-file/files-upload,
+ /api-file/feignUploadHosIdAndDepId,
/api-user/users/isRegUser,
/api-user/users/passwordByPhone,
/api-evaluation/evaluationxrayinfo/appUpload,
/api-evaluation/evaluationxrayinfo/appSave,
/api-file/baseUplaod,
/api-user/users/python,
- /api-evaluation/evaluationxrayinfo/checkQRCode
+ /api-evaluation/evaluationxrayinfo/checkQRCode,
+ /api-opration/wxController/callback,
+ /api-opration/alipay/return,
+ /api-opration/alipay/notify,
+ /api-record/DiagnosticUnfinishedFegin/equipmentList,
+ /api-record/DiagnosticUnfinishedFegin/equipmentUpload,
+ /api-opration/wxController/getOpenId,
+ /api-record/DiagnosticUnfinishedFegin/recordChildInterworking
# /api-user/syshospital/findAllByMap,
# /api-user/sysdictionaries/findAll,
# /api-user/sysdepartment/findListByHospitalId
--
Gitblit v1.8.0