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

mitao

2025-04-01 5af799118134eb1f77bb310433825fe7cf11e680

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

@@ -6,7 +6,7 @@
    <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