Merge remote-tracking branch 'origin/dev' into dev

xuhy

2024-02-01 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d

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