From 4b4f8f1080a7d07468a656a889a2851bd51ba62e Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 06 九月 2024 10:11:01 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 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