Merge remote-tracking branch 'origin/master-v4' into master-v4

cloudroam

2024-12-30 b9903ead016b8b1aa68eb04b48fca3b53fdab0d3

 src/main/resources/mapper/customer/CustomerMapper.xml

@@ -9,7 +9,8 @@
            c.*,
            p.name as partnerName,
            u.nick_name,
            u.tel
            u.tel,
            (select count(o.id) from t_order o where o.create_by = c.user_id  and o.deleted=0 and o.status_backend not in ('PENDING','CANCEL','REFUND')) as orderNum
        FROM
            t_customer_info c
                LEFT JOIN t_user u ON c.user_id = u.id left join t_partner_info p on c.partner_id = p.id where c.deleted = 0