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

admin

2021-08-28 1bf7a7cb5be7c82a3d0c615429e272fd6860ecbe

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