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

mitao

2025-04-11 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9

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

@@ -7,7 +7,8 @@
        select t1.* from t_huimin_card t1
        where
            find_in_set(#{storeId},t1.storeIds)

        and t1.startTime <= now()
        and t1.endTime >= now()

        and t1.status = 1
            order by t1.sort desc
@@ -18,7 +19,8 @@
        select t1.* from t_huimin_card t1
        where
            find_in_set(#{storeId},t1.storeIds)

          and t1.startTime <= now()
          and t1.endTime >= now()

        and t1.status = 1
            order by t1.sort desc