Merge remote-tracking branch 'origin/master'

xuhy

2025-01-10 d1632e46b772d691e55b4013585bfe61164b8bde

 manage/src/main/resources/mapping/TCouponReceiveMapper.xml

@@ -26,7 +26,7 @@
    </sql>
    <select id="pageList" resultType="com.jilongda.manage.vo.TAppUserCouponVO">
        select t1.*
            t_coupon_receive t1
           from t_coupon_receive t1
        where t1.userId = #{query.id}
        and t1.isDelete =  ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
    </select>