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/mapping/WithdrawalMapper.xml

@@ -33,6 +33,10 @@
        withdrawalType as withdrawalType,
        serialNo as serialNo
        from t_pub_withdrawal
        where flag != 3 and userType = #{userType} and userId = #{uid} and type = #{type} order by insertTime desc limit #{pageNum}, #{size}
        where flag != 3 and userType = #{userType} and userId = #{uid} and type = #{type}
        <if test="null != state">
            and state = #{state}
        </if>
        order by insertTime desc limit #{pageNum}, #{size}
    </select>
</mapper>