From 2d0358932cd63ed46778be72d126fc8d766a27a8 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 18 九月 2024 16:15:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
index fc36b35..295e4fd 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
@@ -66,7 +66,7 @@
@ApiOperation("鎷胯蛋鏁版嵁鏌ヨ")
@PostMapping("/selectDamagePrint")
public Result selectDamagePrint(@RequestBody Damage damage) {
- List<Damage> damage2=damageService.selectDamagePrint(damage);
+ List<DamagePrint> damage2=damageService.selectDamagePrint(damage);
return Result.build(200,"鏌ヨ鎴愬姛",damage2);
}
@ApiOperation("鎷胯蛋鎵撳嵃鏌ヨ")
--
Gitblit v1.8.0