Merge branch 'develop' into feature/mzl_dev

app/common/logic/SysCurrencyLogic.php

@@ -16,6 +16,6 @@ class SysCurrencyLogic
 
     public function getList()
     {
-        return SysCurrency::where('status', 1)->get(['id', 'currency_code', 'currency_name', 'currency_symbol', 'exchange_rate', 'float_percent']);
+        return SysCurrency::where('status', 1)->get(['id', 'country_id', 'currency_code', 'currency_name', 'currency_symbol', 'exchange_rate', 'float_percent_up', 'float_percent_down']);
     }
 }

app/common/logic/SysPortLogic.php

@@ -14,9 +14,9 @@ class SysPortLogic
      */
     protected string $modelClass = SysPort::class;
 
-    public function getList()
+    public function getList($where)
     {
-        return SysPort::where('status', 1)->orderBy('sort','desc')->get(['id', 'port_code', 'port_name', 'country_id', 'description']);
+        return SysPort::where('status', 1)->where($where)->orderBy('sort','desc')->get(['id', 'port_code', 'port_name', 'country_id', 'description']);
     }
 
 }