Merge branch 'master' into 'liyuchun_56551'

# Conflicts: # db/update17.0.sql
2022-06-09 01:30:08 +00:00
parent d4d24b6e9d cfb3814e86
commit 9d477cc0cf
1130 changed files with 1887 additions and 3692 deletions
@@ -3,7 +3,7 @@
 * The model file of upgrade module of ZenTaoPMS.
 *
 * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
- * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
 * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
 * @package     upgrade
 * @version     $Id: model.php 5019 2013-07-05 02:02:31Z wyd621@gmail.com $