Merge of fix/Attendance_baidu_map_https to develop

See merge request o2oa/o2oa!144

Merge of fix/Process.mobile_blue_flat_style to develop

See merge request o2oa/o2oa!143

Merge of Feature/[通讯录]个人通讯录操作及权限配置服务

See merge request o2oa/o2oa!139

Merge of feature/[流程管理]增加机管局天印附件（电子签章后的附件）上传接口适配

See merge request o2oa/o2oa!140

Fix/v2retract召回时已经处理禁止召回,召回时替换表单

See merge request o2oa/o2oa!142

Fix/sync master 同步master的修改内容到develop

See merge request o2oa/o2oa!138

Hotfix/delwork 删除工作时导致的线程池锁死

See merge request o2oa/o2oa!135

Merge of feature/Process.log_expand_handwring to develop

See merge request o2oa/o2oa!132

Merge of fix/Process.starer_error to develop

See merge request o2oa/o2oa!131

Merge of fix/bbs.replyService to develop

See merge request o2oa/o2oa!129

以及主贴删除后，回复内容未删除的问题

准备编译发布4,3,2

See merge request o2oa/o2oa!128

thread pool.

See merge request o2oa/o2oa!127

Fix/group as read

See merge request o2oa/o2oa!125

# Conflicts:
#   o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionAssignCreate.java

Revert "Merge branch 'fix/group_as_read' into 'master'"

See merge request o2oa/o2oa!124

This reverts merge request !123

Fix/group as read

See merge request o2oa/o2oa!123

# Conflicts:
#   .gitignore
#   o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionAssignCreate.java

Merge of fix/cms.docment_permission_refresh to develop

See merge request o2oa/o2oa!122

Merge of fix/cms.publishbyworkflow_cipher to develop

See merge request o2oa/o2oa!121