xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/crm' into develop

Browse Source 
# Conflicts:
#	app/common/utils/WsEvents.php
#	app/controller/IndexController.php
#	app/crmAdmin/service/CustomerService.php
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-10-12 18:48:19 +08:00
parent 6b14eea6c3 907e2f92a0
commit 818c516484
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/crmAdmin/service/CustomerService.php
+1 -1
View File
@@ -250,7 +250,7 @@ class CustomerService
$sheet->setCellValue('I' . $row, $customerData['describe']); $sheet->setCellValue('I' . $row, $customerData['describe']);
$sheet->setCellValue('J' . $row, $customerData['user_name']); // 所属人姓名 $sheet->setCellValue('J' . $row, $customerData['user_name']); // 所属人姓名
$sheet->setCellValue('K' . $row, $customerData['enter_user_name']); $sheet->setCellValue('K' . $row, $customerData['enter_user_name']);
$sheet->setCellValue('L' . $row, strip_tags($customerData['desc_collect'])); $sheet->setCellValue('L' . $row, empty($customerData['desc_collect'])? '' :strip_tags($customerData['desc_collect']));
$sheet->setCellValue('M' . $row, $customerData['created_at']->toDateTimeString()); $sheet->setCellValue('M' . $row, $customerData['created_at']->toDateTimeString());
$row++; $row++;