Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304

2023-04-18 08:38:14 +08:00
parent ae8f5f3ac5 b97eb01ace
commit d971d4b4b7
380 changed files with 4493 additions and 3848 deletions
@@ -926,6 +926,7 @@ class actionModel extends model
            }
        }

+        $action->date = substr($action->date, 0, 19);
        if($this->app->getViewType() == 'mhtml') $action->date = date('m-d H:i', strtotime($action->date));

        /* Cycle actions, replace vars. */