# Conflicts:
#   o2web/source/x_component_TeamWork/$NewProject/default/css.wcss
#   o2web/source/x_component_TeamWork/$ProjectList/default/css.wcss
#   o2web/source/x_component_TeamWork/Main.js
#   o2web/source/x_component_TeamWork/Project.js
#   o2web/source/x_component_TeamWork/ProjectList.js
#   o2web/source/x_component_TeamWork/ProjectSetting.js
#   o2web/source/x_component_TeamWork/Task.js

修改所有资源路径为相对路径，增加根据正则表达式应试app和center服务器请求路径

See merge request o2oa/o2oa!556

# Conflicts:
#   o2web/source/x_component_IMV2/$Main/default/chat.html
#   o2web/source/x_component_IMV2/$Main/default/style.css
#   o2web/source/x_component_Org/GroupExplorer.js
#   o2web/source/x_desktop/js/qywxStartProcess.js

Fix/describejs describe.js 682行get修改成load

See merge request o2oa/o2oa!554

Feature/add resource despose[系统设置]增加资源部署、增加服务部署

See merge request o2oa/o2oa!555

base添加企业微信登录

See merge request o2oa/o2oa!553

修改使用IOUtils

See merge request o2oa/o2oa!551

Merge for fix/ctl-rst[系统命令]优化CTL命令中的重启应用命令

See merge request o2oa/o2oa!550

上次少提交了文件，再次提交

See merge request o2oa/o2oa!548

办公中心移动端h5下tab重叠的问题

See merge request o2oa/o2oa!549

Merge of fix/[流程管理]修复流程表单复选框组件只读状态下保存清空值的问题 to develop

See merge request o2oa/o2oa!545

修改了main方法里面直接使用IOUtils,修改dumpRestore的提示信息.

See merge request o2oa/o2oa!544

Fix/console 增加了web客户端输入服务器命令执行与上传war、jar包并自动部署v2,去了日志

See merge request o2oa/o2oa!541

Merge of feature/人员组织模块群组管理优化 to develop

See merge request o2oa/o2oa!539

企业微信启动支持草稿模式

See merge request o2oa/o2oa!542

Merge of feature/group_add_identity to develop 群组增加身份成员的功能

See merge request o2oa/o2oa!538

Merge of feature/log_addCommand to develop 日志模块增加可执行服务器命令的功能

See merge request o2oa/o2oa!536

Merge of feature/[流程平台]增加管理员查询review to develop

See merge request o2oa/o2oa!535

Merge of feature/[流程管理]新增流程自定义提交 to develop

See merge request o2oa/o2oa!540

# Conflicts:
#   o2web/source/x_component_process_Work/Processor.js
#   o2web/source/x_component_process_Xform/Form.js