Merge branch 'develop'

# Conflicts:
#	app/common/controller/NotifyController.php
#	app/common/service/UserService.php
#	app/crm/service/CustomerService.php
#	config/constants/Constants.php
This commit is contained in:
mzl
2025-07-29 10:24:10 +08:00
parent d74b374198
commit 1f602a690b
4 changed files with 11 additions and 8 deletions
+1
View File
@@ -110,6 +110,7 @@ class CustomerService
public static function getCustomer($customer, $language = 'zh_CN', $tag = false)
{
$customer['grade_txt'] = Util::language($language, Constants::GRADE_EN[$customer['grade']], Constants::GRADE_ZH[$customer['grade']], Constants::GRADE_RU[$customer['grade']]);
$customer['magnitude'] = ($customer['magnitude']==0)?1:$customer['magnitude'];
$customer['magnitude_txt'] = Util::language($language, Constants::MAGNITUDE_EN[$customer['magnitude']], Constants::MAGNITUDE[$customer['magnitude']], Constants::MAGNITUDE_RU[$customer['magnitude']]);
$customer['sex_txt'] = Util::language($language, Constants::SEX_EN[$customer['sex']], Constants::SEX[$customer['sex']], Constants::SEX_RU[$customer['sex']]);