Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-07 781f5c68b8c3388811d74f19c6b469e90d11d727

 flower_city/src/main/java/com/dg/core/api/TransactionEventAppletsController.java

@@ -50,9 +50,9 @@
     */
    @ApiOperation(value = "导办事物列表(不分页)",response = TransactionEvent.class)
    @GetMapping("/selectList")
    public TableDataInfo selectList()
    public TableDataInfo selectList(@RequestParam(value = "keyWord",required = false) String keyWord)
    {
        return getDataTable(iTransactionEventService.selectList());
        return getDataTable(iTransactionEventService.selectList(keyWord));
    }