Merge remote-tracking branch 'origin/htasrs0' into htasrs0

王佳豪

2021-06-03 a1844a7fc934ca943db810b1bd2a450f948607cd

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