Merge remote-tracking branch 'origin/master'

jiangping

2024-07-18 acb1a535f7df6f943159e13e5199a705f7e98074

 server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java

@@ -233,9 +233,11 @@
        queryWrapper.orderByDesc(CustomerLog::getCreateDate);
        PageData<CustomerLog> pageData = PageData.from(customerLogMapper.selectJoinPage(page,CustomerLog.class, queryWrapper));
        for (CustomerLog customerLog:pageData.getRecords()) {
            customerLog.setPhone(
                    customerLog.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")
            );
            if(Objects.nonNull(pageWrap.getModel().getMemberId())){
                customerLog.setPhone(
                        customerLog.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")
                );
            }
        }
        return pageData;
    }