Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

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

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

@@ -35,7 +35,7 @@
     * @param
     * @return
     */
    public List<TransactionEvent> selectConfigList(@Param("matterAndUser") String matterAndUser,
    public List<TransactionEvent> selectConfigList(@Param("keyword") String keyword,
                                                   @Param("classifyGrade") String classifyGrade,
                                                   @Param("ids") List<String> ids);

@@ -65,7 +65,7 @@
     * @param
     * @return
     */
    public int countNum(@Param("matterAndUser") String matterAndUser,
    public int countNum(@Param("keyword") String keyword,
                        @Param("classifyGrade") String classifyGrade,
                        @Param("ids") List<String> ids);