Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-10 2b9cdcbaccb6ea4c4ffe9461d0589ab3e28ef7f3

 flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java

@@ -25,7 +25,8 @@
     */
    public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
                                                   @Param("matterAndUser") String matterAndUser,
                                                   @Param("classifyGrade") String classifyGrade);
                                                   @Param("classifyGrade") String classifyGrade,
                                                   @Param("ids") List<String> ids);

    /**
     * 新增导办事务
@@ -54,7 +55,8 @@
     * @return
     */
    public int countNum(@Param("matterAndUser") String matterAndUser,
                        @Param("classifyGrade") String classifyGrade);
                        @Param("classifyGrade") String classifyGrade,
                        @Param("ids") List<String> ids);

    /**
     * 导办事务搜索