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

zxl

2025-07-31 1c7c1366a88bcb056a0e0bc5e0e2dfe8470b4be2

 framework/src/main/resources/mapper/lmk/CustomerMapper.xml

@@ -38,7 +38,7 @@
            LM.*
        FROM
            li_member LM
        LEFT JOIN lmk_customer_black LMK ON LM.id = LMK.user_id and LMK.delete_flag = 0

        <where>
        <!-- 用户名模糊查询 -->
        <if test="query.username != null and query.username != ''">