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

Merge of fix/documenteditor_print_name to develop

See merge request o2oa/o2oa!981

(cherry picked from commit 2fa8143d)

168fc0c4 servers增加权限

Merge branch 'fix/documenteditor_print_name' into 'develop'

See merge request o2oa/o2oa!980

Merge of fix/documenteditor_print_name to develop 增加联合发文、命令模板，修正表单中布尔值保存不上的问题

See merge request o2oa/o2oa!979

(cherry picked from commit 12fb5afe)

e05f79d8 增加联合发文、命令模板，修正表单中布尔值保存不上的问题

IM消息web端解析

See merge request o2oa/o2oa!978

IM消息web端解析

See merge request o2oa/o2oa!977

(cherry picked from commit 39b98152)

c34fc71f IM消息web端解析

Merge branch 'feature/prevTask' into 'develop'

See merge request o2oa/o2oa!976

未完成待办自动转待阅

See merge request o2oa/o2oa!975

(cherry picked from commit a720e57e)

731b7863 未完成待办自动转待阅

Merge branch 'fix/describejs0701' into 'develop'

See merge request o2oa/o2oa!974

service api 界面post提交时去掉空值参数

See merge request o2oa/o2oa!971

(cherry picked from commit 10feaea5)

0bcf5cb9 'post提交时去掉空值参数'

Merge branch 'feature/prevTask' into 'develop'

See merge request o2oa/o2oa!973

增加上一处理人意见

See merge request o2oa/o2oa!972

(cherry picked from commit dc843541)

b5cd6998 增加上一处理人意见

Merge branch 'fix/提取html转pdf为通用工具接口' into 'develop'

See merge request o2oa/o2oa!970

[平台工具]新增提取html转pdf为通用工具接口

See merge request o2oa/o2oa!961

(cherry picked from commit 4361aabe)

16f101df 提取html转pdf为通用工具接口

Merge branch 'fix/work分页查询bug' into 'develop'

See merge request o2oa/o2oa!969

Merge of fix/work分页查询bug to develop

See merge request o2oa/o2oa!966

(cherry picked from commit 7e45f5dc)

114eecc0 work分页查询bug修复

[内容管理]修复了在某些情况下排序索引列过长，无法正确处理权限的问题

See merge request o2oa/o2oa!967

[考勤管理]修复了在某些情况下发起考勤结果申诉出现错误的问题(汇报领导)

See merge request o2oa/o2oa!964

[考勤管理]修复考勤排班设置新建某些情况下无法保存问题

See merge request o2oa/o2oa!962

Merge of fix/attendance to develop【修复考勤排班设置新建某些情况下无法保存问题】

See merge request o2oa/o2oa!938

(cherry picked from commit f503ca5f)

d19cba3c 考勤排班设置新建某些情况下无法保存

[日程安排]修复了在某些情况下无法更新重复日程的问题

See merge request o2oa/o2oa!955

[考勤管理]修复了在某些情况下发起考勤结果申诉出现错误的问题

See merge request o2oa/o2oa!953