From d526d571cbe0a950e777fb325978d72f3ddb302b Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Thu, 13 Aug 2020 21:38:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
index 4341125..3d67a91 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
@@ -68,8 +68,9 @@
      * base64上传图片
      */
     @PostMapping(value="baseUplaod",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE},consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public FileInfo baseUplaod(@RequestParam("file") String file,@RequestParam("imgType") String imgType){
-        return fileService.baseUplaod(file,imgType);
+    public FileInfo baseUplaod(@RequestParam("file") String file,@RequestParam("imgType") String imgType,
+                               @RequestParam("hospitalId") String hospitalId,@RequestParam("departmentId") String departmentId){
+        return fileService.baseUplaod(file,imgType,hospitalId,departmentId);
     }
     /**
      * base64图片下载

--
Gitblit v1.8.0