From c61be765fe40fce1a57471a8fc8b93932c0a970c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 02 四月 2022 15:37:50 +0800
Subject: [PATCH] Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs

---
 src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index ffe6a7d..63e7cd2 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -23,7 +23,7 @@
     }
 
     @Override
-    public WrkMast selectToBeHistoryData() {
+    public List<WrkMast> selectToBeHistoryData() {
         return this.baseMapper.selectToBeHistoryData();
     }
 

--
Gitblit v1.9.1