Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into xtyasrs

luxiaotao1123

2020-07-16 82c794aa1691821120ca4c6c8fda54a18cbb95f0

 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();
    }