diff --git a/app/common/model/User.php b/app/common/model/User.php index d7ca8e1..341b5b5 100644 --- a/app/common/model/User.php +++ b/app/common/model/User.php @@ -40,7 +40,7 @@ class User extends Model /** * 允许自动填充模型字段 */ - protected $fillable = ['id', 'union_id', 'app_id', 'name', 'avatar', 'phone', 'email', 'whatsapp', 'social', 'social_code', 'status', 'role']; + protected $fillable = ['id', 'union_id', 'app_id', 'name', 'name_en', 'avatar', 'phone', 'email', 'whatsapp', 'social', 'social_code', 'status', 'role']; /** * 不允许自动填充模型字段 diff --git a/app/common/utils/pdf/service/MpdfDriver.php b/app/common/utils/pdf/service/MpdfDriver.php index 61af5bb..2ce6860 100644 --- a/app/common/utils/pdf/service/MpdfDriver.php +++ b/app/common/utils/pdf/service/MpdfDriver.php @@ -160,9 +160,10 @@ class MpdfDriver $car['code'] // 拥有者密码(一定要设置) ); + $user['name_en'] = empty($user['name_en'])?$user['name']:$user['name_en']; //设置水印 $mpdf->SetWatermarkText( - $user['name'] .' '. $contact, + $user['name_en'] , 0.08 ); $mpdf->showWatermarkText = true;