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/WithdrawalMapper.java

@@ -18,6 +18,6 @@
     * @return
     */
    List<Map<String, Object>> queryWithdrawal(@Param("uid") Integer uid, @Param("userType") Integer userType,
                                              @Param("type") Integer type, @Param("pageNum") Integer pageNum,
                                              @Param("type") Integer type, @Param("state") Integer state, @Param("pageNum") Integer pageNum,
                                              @Param("size") Integer size);
}