Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel

puzhibing

2024-02-23 d59956a6d7b12d122f7dbdfaecd46688697e6be0

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/IncomeMapper.java

@@ -20,6 +20,5 @@
    List<Map<String,Object>> getList2(@Param("page") Page<Map<String, Object>> page,
                                      @Param("times") String times);

    List<Map<String,Object>> getTotal(
                                      @Param("times") String times);
    List<Map<String,Object>> getTotal(@Param("times") String times);
}