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

luxiaotao1123

2021-04-15 5fa3c13b13f100525b3e076cad3742b202afb284

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