Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

 flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java

@@ -24,14 +24,14 @@
     * @return
     */
    public List<TransactionEvent> selectConfigList(IPage<TransactionEvent> page, Integer state,
                                                   String matterAndUser, String classifyGrade,
                                                   String keyword, String classifyGrade,
                                                   List<String> ids);

    /**
     * 导办事物列表
     * @return
     */
    public List<TransactionEvent> selectConfigList(String matterAndUser, String classifyGrade,
    public List<TransactionEvent> selectConfigList(String keyword, String classifyGrade,
                                                   List<String> ids);

    /**
@@ -59,7 +59,7 @@
     * 统计数量
     * @return
     */
    public int countNum(String matterAndUser,String classifyGrade,List<String> ids);
    public int countNum(String keyword,String classifyGrade,List<String> ids);

    /**
     * 导办事务搜索