From 30f6da8bf0143906b42fa600f6a604cea6c81f71 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:16:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
index d5419af..c0295d4 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
@@ -29,7 +29,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "妫�楠屾ā鍧�")
+@Api(tags = "妫�楠屾ā鍧�-->妫�楠屽崟")
@RestController
@RequestMapping("/inspection")
public class InspectionController {
@@ -52,10 +52,7 @@
})
@PostMapping("/addInspection")
public Result addInspection(@RequestHeader("X-Token") String token, int type) throws Exception {
- System.out.println(token);
- System.out.println(type);
Object object = RedisUtil.get(token);
- System.out.println(object);
Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
return Result.success(inspectionService.addInspection("" + unmarshal.get("name"), type));
}
@@ -99,7 +96,7 @@
return Result.success(materialService.selectMaterialById(materialId));
}
- @ApiOperation("鎻愪氦鐢宠")
+ @ApiOperation("鎻愪氦妫�楠屽崟鐢宠")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "inspectionId", value = "妫�楠屽崟ID", dataTypeClass = String.class, required = true),
})
@@ -108,7 +105,7 @@
return Result.success(inspectionService.subInspectionByInsId(inspectionId));
}
- @ApiOperation("浣滃簾鐢宠")
+ @ApiOperation("浣滃簾妫�楠屽崟鐢宠")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "inspectionId", value = "妫�楠屽崟ID", dataTypeClass = String.class, required = true),
})
--
Gitblit v1.9.3