Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

2021-04-07 14:53:01 +08:00
parent f7f7bdc651 b94fa22b92
commit c1fdb0bbc0
95 changed files with 969 additions and 488 deletions
@@ -2756,6 +2756,7 @@ class upgradeModel extends model
        $fromVersion = $this->config->installedVersion;
        $needProcess = array();
        if(strpos($fromVersion, 'biz') === false and (strpos($fromVersion, 'pro') === false ? version_compare($fromVersion, '8.3', '<') : version_compare($fromVersion, 'pro5.4', '<'))) $needProcess['updateFile'] = true;
+        if(strpos($fromVersion, 'max') === false and version_compare($fromVersion, '15.0', '<')) $needProcess['search'] = true;
        return $needProcess;
    }