Merge remote-tracking branch 'origin/2.0' into 2.0

mitao

2025-03-31 51f26723bee741bf112c8d0d965d0e2f2974bd04

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

@@ -6,8 +6,18 @@
    <select id="getHuiminAgreementAndList" resultType="com.dsh.activity.entity.THuiminCard">
        select t1.* from t_huimin_card t1
        where t1.storeId = #{storeId}
          and t1.startTime &lt;= now()
          and t1.endTime >= now()
        and t1.status = 1
            order by t1.sort desc
            limit #{pageNo}, #{pageSize}

    </select>
    <select id="getMyHuiminCardList" resultType="com.dsh.activity.model.response.MyHuiminCardVO">
        select t1.* from t_pay_huimin t1
        where  t1.status = 2
            and t1.appUserId = #{appUserId}
            limit #{pageNo}, #{pageSize}

    </select>
</mapper>