From 84f28e6743089c1147e078763de6eafe52d0dc31 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 12 二月 2025 14:15:40 +0800
Subject: [PATCH] 解决冲突
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java
index 6a21a0b..f414bf7 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java
@@ -435,7 +435,6 @@
//通过车辆id查询列表
List<CollectCarTotalUpDto> list = collectRecordService.carGroup(byId.getCarId(),name);
return R.ok(list);
-
}
@ApiOperation(value = "已装车列表详情",tags = "运输人员")
--
Gitblit v1.7.1