Merge branch 'master' into 'sprint_200'

# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
#   module/execution/view/kanban.html.php
#   module/kanban/css/space.css
This commit is contained in:
王怡栋
2022-06-09 03:16:20 +00:00
1143 changed files with 1936 additions and 7700 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
* The model file of user 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 user
* @version $Id: model.php 5005 2013-07-03 08:39:11Z chencongzhi520@gmail.com $