Merge branch 'fix/docToWordWorkCompleted' into 'develop'

See merge request o2oa/o2oa!1087

(cherry picked from commit 5c72654d)

c61618b8 Merge branch 'fix/docToWordWorkCompleted' into 'develop'

Merge branch 'feature/segment_enable' into 'develop'

See merge request o2oa/o2oa!1052

修改默认爬虫设置为启用

See merge request o2oa/o2oa!1050

(cherry picked from commit ff56acd2)

7f8060b9 修改默认爬虫设置为启用

Merge branch 'feature/segment_enable' into 'develop'

See merge request o2oa/o2oa!1048

添加爬虫启动状态

See merge request o2oa/o2oa!1047

(cherry picked from commit 51e9db69)

bbed443b 添加爬虫启动状态

Merge branch 'feature/personCustom' into 'develop'

See merge request o2oa/o2oa!1043

【个人设置】新增管理员获取指定用户的Custom

See merge request o2oa/o2oa!1042

(cherry picked from commit 123bbf7b)

173393be 【个人设置】获取指定用户的Custom
d3565492 【个人设置】新增管理员获取指定用户的Custom

Merge branch 'fix/describejs0706' into 'develop'

See merge request o2oa/o2oa!1040

Fix/describejs0706

See merge request o2oa/o2oa!1039

(cherry picked from commit 5e722127)

779c8aa4 '增加数据库表结构显示功能'

Merge branch 'fix/updateContentLength' into 'develop'

See merge request o2oa/o2oa!1038

增加contentLength

See merge request o2oa/o2oa!1037

(cherry picked from commit 260d08f8)

f4281f21 增加contentLength

Merge branch 'fix/群组查询部分接口缺少身份信息' into 'develop'

See merge request o2oa/o2oa!1035

【人员组织】修复部分群组查询接口缺少身份信息的问题 to develop

See merge request o2oa/o2oa!1032

(cherry picked from commit acc2907f)

102336b5 修复部分群组查询接口缺少身份信息的问题

Merge branch 'fix/reroute' into 'develop'

See merge request o2oa/o2oa!1031

当路由错误时无法调度的BUG

See merge request o2oa/o2oa!1030

(cherry picked from commit 914bb47c)

4c286a8f 当路由错误时无法调度的BUG

Merge branch 'fix/modifyCfg' into 'develop'

See merge request o2oa/o2oa!1023

修改cfg

See merge request o2oa/o2oa!1022

(cherry picked from commit b3115c8b)

3ff406a4 修改cfg

Merge branch 'fix/deleteTeamWork' into 'develop'

See merge request o2oa/o2oa!1020

删除teamwork

See merge request o2oa/o2oa!1019

(cherry picked from commit 25790fca)

8d822901 删除teamwork

Merge branch 'fix/teamworkmove' into 'develop'

See merge request o2oa/o2oa!1018

移动teamwork

See merge request o2oa/o2oa!1017

(cherry picked from commit e2107086)

08c6e435 移动teamwork

Merge branch 'fix/form_copy' into 'develop'

See merge request o2oa/o2oa!1015

Merge of fix/form_copy to develop 修复脚本拷贝粘贴时，和设计元素的拷贝粘贴冲突

See merge request o2oa/o2oa!1014

(cherry picked from commit 7fbe9c65)

28b0f156 修复脚本拷贝粘贴时，和设计元素的拷贝粘贴冲突

Merge branch 'fix/teamwork_1024' into 'develop'

See merge request o2oa/o2oa!1013

teamWork内置应用转为custom应用 Fix/teamwork 1024

See merge request o2oa/o2oa!1012

(cherry picked from commit f1ad692a)

cfd2b390 teamwok服务接口修改
334cde5b teamWork服务接口
95264445 teamwork权限
b5c1478f teamwork后台服务
d1a9d90b teamwork后台服务
291f2c15 teamwork后台服务
9673ac90 teamwork后台服务
c86de453 teamwork后台服务
da010299 人员组织导入导出服务
0b7599d8 teamwork后台服务
e0114e98 teamwork服务
95a5f381 teamwork后台服务
1eb5970f teamwork添加实体类
85202abb 添加默认角色teamworkmanager
ba5d90ee teamwork初始化默认优先级服务
066f742d teamwork添加自定义字段服务
979caa5e teamwork自定义字段服务
6413333d teamwork扩展字段服务
f6d5a5a2 teamwork统计相关服务_预留
194e33c5 teamwok扩展属性服务
e45755b1 teamwork转为custom应用
75d9a52f teamwork转为custom应用
1e51e9e4 teamwork转为custom应用
0e6c7d24 teamwork模板缓存问题修复
6933f523 Merge branch 'feature/teamwork.view_add' into fix/teamwork_1024

Merge branch 'fix/form_copy' into 'develop'

See merge request o2oa/o2oa!1011

Merge of fix/form_copy to develop 修复脚本拷贝粘贴时，和设计元素的拷贝粘贴冲突

See merge request o2oa/o2oa!1010

(cherry picked from commit 06efc832)

12f52d8c 修复脚本拷贝粘贴时，和设计元素的拷贝粘贴冲突

Merge branch 'feature/teamwork_0522' into 'develop'

See merge request o2oa/o2oa!1009

工作管理第一版封版提交【前端】

See merge request o2oa/o2oa!1002

(cherry picked from commit e5c0d214)

14f5f4ca 更新团队前台
c9eafb94 更新团队前台
13cf0fe3 更新团队前台
55b5f191 Merge branch 'develop' into 'feature/teamwork_0522'

Merge branch 'fix/recordCompleted' into 'develop'

See merge request o2oa/o2oa!1008

record已经完成workCompleted判断

See merge request o2oa/o2oa!1007

(cherry picked from commit b012d42e)

415961b7 record已经完成workCompleted判断

Merge branch 'fix/invoke-angent-save-bug' into 'develop'

See merge request o2oa/o2oa!1005

[编辑器]修改代理、接口monaco编辑器打开、保存报错问题

See merge request o2oa/o2oa!1001

(cherry picked from commit 58eaebab)

11a1e7e2 [编辑器]修改代理、接口monaco编辑器打开、保存报错问题

V5.1.1发布

See merge request o2oa/o2oa!999

gulp-uglify-es

See merge request o2oa/o2oa!997

(cherry picked from commit 46b9d5ed)

Merge branch 'fix/documenteditor_print_name' into 'develop'

See merge request o2oa/o2oa!984

Merge of fix/documenteditor_print_name to develop 信函类公文模板的红线修改

See merge request o2oa/o2oa!983

(cherry picked from commit 7bd75772)

cbb4f3f6 信函类公文模板的红线修改

Merge branch 'fix/documenteditor_print_name' into 'develop'

See merge request o2oa/o2oa!982