Merge remote-tracking branch 'origin/master'

lin

2024-04-23 2be4713d25c0a295e3f84772dfc3faa0e4930ed2

 src/main/java/org/springblade/modules/pay/mapper/OrderInfoMapper.xml

@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.modules.pay.mapper.OrderInfoMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="orderInfoResultMap" type="org.springblade.modules.pay.entity.OrderInfoEntity">
    <resultMap id="orderInfoResultMap" type="org.springblade.modules.pay.vo.OrderInfoVO">
    </resultMap>