Merge remote-tracking branch 'origin/master'

liujie

2023-10-07 44311853fa68f04db11d341bd374a4ac9b5ea567

 cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml

@@ -3,4 +3,9 @@
<mapper namespace="com.dsh.activity.mapper.UserPointsMerchandiseMapper">


    <select id="getAmount" resultType="com.dsh.activity.model.PointMerchandiseIncomeVo">
        select t1.*,t2.cash  from t_user_points_merchandise t1
        left join t_points_merchandise t2 on t1.pointsMerchandiseId = t2.id
        where t1.payStatus =2
    </select>
</mapper>