From c565deb6ad9903ddc7fb09647adf4fc2cc31ef49 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期一, 27 二月 2023 17:21:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/upload/UploadController.java b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
index e3bf925..a850243 100644
--- a/src/main/java/com/lf/server/controller/data/upload/UploadController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
@@ -83,7 +83,7 @@
@ApiOperation(value = "涓婁紶Excel闄勪欢")
@ApiImplicitParams({
@ApiImplicitParam(name = "path", value = "璺緞", dataType = "String", paramType = "query"),
- @ApiImplicitParam(name = "ids", value = "婧愭暟鎹泦鍚�", dataType = "Integer", paramType = "query")
+ @ApiImplicitParam(name = "ids", value = "鍏冩暟鎹泦鍚�", dataType = "Integer", paramType = "query")
})
@ResponseBody
@PostMapping(value = "/uploadXlsAnnex")
@@ -94,12 +94,12 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
if (null == ids || ids.length == 0) {
- return fail("鎵句笉鍒版簮鏁版嵁鐨処D闆嗗悎");
+ return fail("鎵句笉鍒板厓鏁版嵁鐨処D闆嗗悎");
}
List<MetaEntity> ms = metaService.selectXlsAnnex(ids, UploadAttachService.getTabs());
if (null == ms || ms.isEmpty()) {
- return fail("鎵句笉鍒拌涓婁紶闄勪欢鐨勬簮鏁版嵁");
+ return fail("鎵句笉鍒拌涓婁紶闄勪欢鐨勫厓鏁版嵁");
}
List<MetaFileEntity> list = uploadService.uploadData(null, path, false, req, res);
@@ -109,7 +109,7 @@
List<KeyValueEntity> rs = uploadAttachService.uploadXlsAnnex(ue, ms, list, path);
if (null == rs || rs.size() == 0) {
- return fail("娌℃湁瑕佹洿鏂扮殑婧愭暟鎹�");
+ return fail("娌℃湁瑕佹洿鏂扮殑鍏冩暟鎹�");
}
return success(rs);
@@ -197,7 +197,7 @@
@SysLog()
@ApiOperation(value = "鎻掑叆鏂囦欢")
@ApiImplicitParams({
- @ApiImplicitParam(name = "list", value = "婧愭暟鎹枃浠堕泦鍚�", dataType = "MetaFileEntity", paramType = "body")
+ @ApiImplicitParam(name = "list", value = "鍏冩暟鎹枃浠堕泦鍚�", dataType = "MetaFileEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/insertFiles")
@@ -208,7 +208,7 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
if (null == list || list.isEmpty()) {
- return fail("婧愭暟鎹枃浠堕泦鍚堜负绌�", null);
+ return fail("鍏冩暟鎹枃浠堕泦鍚堜负绌�", null);
}
uploadService.insertFiles(ue, list, req);
@@ -220,7 +220,7 @@
}
@SysLog()
- @ApiOperation(value = "鍒犻櫎婧愭暟鎹�")
+ @ApiOperation(value = "鍒犻櫎鍏冩暟鎹�")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1,2")
})
--
Gitblit v1.9.3