From 5fb393a728e569f834059cb1cedbaf128d878b9a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 13 七月 2020 17:16:57 +0800
Subject: [PATCH] Merge branches 'gdasrs' and 'master' of https://gitee.com/luxiaotao1123/zy-asrs into gdasrs
---
src/main/java/com/zy/asrs/service/WrkMastService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index 532d8cc..f5c3e5c 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -11,6 +11,6 @@
List<WrkMast> selectToBeCompleteData();
- WrkMast selectToBeHistoryData();
+ List<WrkMast> selectToBeHistoryData();
}
--
Gitblit v1.9.1