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

luofl

2025-04-11 a9edc2f62628007e2c5e86d416d484780238f13f

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

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

          and t1.endTime >= now()

        and t1.status = 1
            order by t1.sort desc
            limit #{pageNo}, #{pageSize}
@@ -19,7 +19,7 @@
        where
            find_in_set(#{storeId},t1.storeIds)

          and t1.endTime >= now()

        and t1.status = 1
            order by t1.sort desc
    </select>