Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/abutment/controller/Good.php

@@ -757,7 +757,7 @@ class Good extends BaseController
             $json = json_encode($timp, JSON_UNESCAPED_UNICODE);
             $jsp = json_encode($data, JSON_UNESCAPED_UNICODE);
             if ($up) {
-                ChangeLog::logAdd(3, $data['spuCode'], $jsp, $json, c, $this->post);
+                ChangeLog::logAdd(3, $data['spuCode'], $jsp, $json, ['id' => $uid, 'nickname' => $nickname], $this->post);
                 if ($speclist !== "" && !empty($speclist)) {
                     foreach ($speclist as $value) {
                         $lemp = [];