Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-18 53562814add61acfdc02d6b25dae6324f6fd5f92

 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);
}