Merge branch 'dev' into user_action

peng

2025-09-19 fa71b7aa27b81d6dde8e870da34f9b64d685df4b

 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 != ''">