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 | 6 +++++-
1 files changed, 5 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 ea41ca8..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,6 +226,7 @@
- /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
@@ -234,6 +235,7 @@
- /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
@@ -261,6 +263,7 @@
/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,
@@ -273,7 +276,8 @@
/api-opration/alipay/notify,
/api-record/DiagnosticUnfinishedFegin/equipmentList,
/api-record/DiagnosticUnfinishedFegin/equipmentUpload,
- /api-opration/wxController/getOpenId
+ /api-opration/wxController/getOpenId,
+ /api-record/DiagnosticUnfinishedFegin/recordChildInterworking
# /api-user/syshospital/findAllByMap,
# /api-user/sysdictionaries/findAll,
# /api-user/sysdepartment/findListByHospitalId
--
Gitblit v1.8.0