Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-01 816723558ad20dc16b08426df30504cda21873c1

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

@@ -178,6 +178,13 @@
    List<TransactionEvent> selectListByIds(String[] list);

    /**
     * 根据分类筛选数据
     * @param ids
     * @return
     */
    List<TransactionEvent> selectClassifyList(List<String> ids);

    /**
     * 根据部门判断是否有事项名称重复
     */
    String selectDataIfExist(@Param("departmentId") String departmentId,