From 541e9a5eb10f788f1f8067823fa6f71e1b52c31e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 12 十二月 2022 14:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/file/FileExportDto.java                  |    7 +++++--
 phis-feign/src/main/java/com/hz/phis/dt/file/FileExportDt.java                   |   12 ++++++++++++
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFileService.java |    1 +
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/file/FileExportDto.java b/phis-feign/src/main/java/com/hz/his/dto/file/FileExportDto.java
index 98f992a..b07f155 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/file/FileExportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/file/FileExportDto.java
@@ -14,10 +14,11 @@
     private String operatorName;
     /**鎿嶄綔鐩爣瀵硅薄(phi-common FileTargetEnum)*/
     private Integer opTarget;
-    /**鎴愬姛鏂囦欢瀛樺偍鍦板潃*/
-    private String fileUrl;
+
 
     /****************闈炲繀濉」*****************************/
+    /**鎴愬姛鏂囦欢瀛樺偍鍦板潃*/
+    private String fileUrl;
     /**鎿嶄綔鍐呭鍚嶇О(phi-common FileTargetEnum)*/
     private String opName;
     /**浠诲姟鐘舵��  phi-common FileStatusEnum*/
@@ -40,4 +41,6 @@
     private String failUrl;
     /**澶囨敞淇℃伅*/
     private String remarks;
+    /**閿欒淇℃伅*/
+    private String errMsg;
 }
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFileService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFileService.java
index 75e63c1..d9890cd 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFileService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipFileService.java
@@ -15,6 +15,7 @@
 
     /**
      * 寮�鏀惧钩鍙�-鐢熸垚瀵煎嚭鏂囦欢璁板綍
+     * 杞崲FileExportDt
      */
     @PostMapping(value = "/file/common/export/getId")
     Result getFileExportRecord(@RequestBody FileExportDto fileExportDto);
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/file/FileExportDt.java b/phis-feign/src/main/java/com/hz/phis/dt/file/FileExportDt.java
new file mode 100644
index 0000000..fd3ae6a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/file/FileExportDt.java
@@ -0,0 +1,12 @@
+package com.hz.phis.dt.file;
+
+import lombok.Data;
+
+/**
+ * 鏂囦欢瀵煎嚭鎵╁睍
+ **/
+@Data
+public class FileExportDt {
+    /**璁板綍鏍囪瘑*/
+    private String id;
+}

--
Gitblit v1.8.0