Merge branch 'develop' into feature/mzl_dev

2025-09-18 15:04:59 +08:00
parent 9331aa2f36 e2f2e0147e
commit cd29507c45
23 changed files with 933 additions and 6 deletions
@@ -346,7 +346,7 @@ class CustomerController extends BaseController
            'address' => Util::getParam($request, 'address', ''),
            'sex' => Util::getParam($request, 'sex', 0),
            'obtain' => time(),
-            'company' => Util::getParam($request, 'company', 0),
+            'company' => Util::getParam($request, 'company', ''),
        ];

        if (Util::isEmpty($id)) {
@@ -3,6 +3,7 @@
 namespace app\crm\model;


+use app\common\model\Country;
 use app\crm\utils\Util;
 use config\constants\Constants;
 use DateTimeInterface;
@@ -106,4 +107,9 @@ class Customer extends Model
            return $this->save($options);
        });
    }
+
+    public function countryInfo()
+    {
+        return $this->hasOne(Country::class, 'id', 'country_id');
+    }
 }