Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-14 d9f7787e24dd9ee4136298bcfd141aed1bb3ed7c

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

@@ -70,7 +70,7 @@
     * @param matterName
     * @return
     */
    List<TransactionEvent> queryMatterNameList(String matterName);
    List<TransactionEvent> queryMatterNameList(@Param("matterName") String matterName,@Param("classifyId") String classifyId);

    /**
     * 导办事务搜索统计数量
@@ -165,6 +165,19 @@
    String selectDataIfExist(@Param("departmentId") String departmentId,
                             @Param("matterName") String matterName);

    /**
     * 根据办事分类获取办事指南
     */
    List<String> selectclassifyId(String classifyId);


    /**
     * 根据关联词导办事务搜索搜索(不分页)(去重用于小程序)
     * @param keyWord
     * @return
     */
    List<Search>  selectSearchAssociateDistinct( String keyWord);



}