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

puzhibing

2024-05-06 7c26ec693561ecce9fba31ab4e83e9f30d641aad

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

@@ -12,7 +12,7 @@


    List<Map<String, Object>> query(@Param("userType") Integer userType, @Param("objectId") Integer objectId,
                                    @Param("type") Integer type, @Param("pageNum") Integer pageNum,
                                    @Param("type") List<Integer> type, @Param("pageNum") Integer pageNum,
                                    @Param("size") Integer size);