Merge remote-tracking branch 'origin/master'

lin

2024-04-13 5497dd57b68dd7ef0ec5844e5f8c0816f7048f25

 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>