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

lidongdong

2022-10-24 2d26c2b864cad8b988adc5258e3e06eaff4c35a4

 flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java

@@ -229,7 +229,12 @@
    }

    @Override
    public List<TransactionEvent> selectList() {
    public List<TransactionEvent> selectList(String keyWord) {
        if (keyWord!=null&&keyWord!=""){
            return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda().like(TransactionEvent::getMatterName,keyWord));
        }
        else {
        return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda());
        }
    }
}