修复web端IM聊天的一个bug develop_java8

See merge request o2oa/o2oa!4222

修复web端IM聊天的一个bug develop

See merge request o2oa/o2oa!4221

(cherry picked from commit 4ccd8c46)

0a6c2b26 Merge branch 'fix/im_js_bug' into 'wrdp'

【移动办公】移动端提示消息位置显示的bug develop_java8

See merge request o2oa/o2oa!4216

【移动办公】移动端提示消息位置显示的bug develop

See merge request o2oa/o2oa!4215

(cherry picked from commit 4abdb422)

9ccbe6ec Merge branch 'fix/message_mobile_position_bug' into 'wrdp'

Merge branch 'fix/ImportModel' into 'wrdp'

See merge request o2oa/o2oa!4207

Merge of fix/ImportModel 修复导入模型、数据模板、人员职务信息的问题 to wrdp

See merge request o2oa/o2oa!4206

(cherry picked from commit 2b9bd64f)

13f4fd40 导入模型修改
9df4ad17 导入模型修改
60f2f927 修复导入模型、数据模板、人员职务信息的问题

修正Boolean支持

See merge request o2oa/o2oa!4200

修复表单设计查看html不准确的问题

See merge request o2oa/o2oa!4196

(cherry picked from commit 26ac22b2)

修复根据用户和组织查询身份组织条件不起作用的问题

See merge request o2oa/o2oa!4193

(cherry picked from commit 196dfa50)

清理

See merge request o2oa/o2oa!4188

Merge branch 'fix/修改根据work查询待办、待阅' into 'wrdp'

See merge request o2oa/o2oa!4182

[流程平台]修改根据work查询待办、待阅

See merge request o2oa/o2oa!4165

(cherry picked from commit 880e631b)

21978f03 修改根据work查询待办、待阅

增加阅读意见和阅读记录

See merge request o2oa/o2oa!4181

(cherry picked from commit 63dd2eff)

java8 pom openjpa3.2.0

See merge request o2oa/o2oa!4175

修正gbase支持

See merge request o2oa/o2oa!4171

Merge branch 'fix/ImportModel' into 'wrdp'

See merge request o2oa/o2oa!4167

Merge of fix/ImportModel 导入模型修改 to wrdp

See merge request o2oa/o2oa!4166

(cherry picked from commit f27e1bb9)

d0f6e4ce 修复导入模型的问题

Merge branch 'cherry-pick-34eddb78' into 'develop'

See merge request o2oa/o2oa!4162

Merge branch 'fix/jira_mobile_bug' into 'wrdp'

See merge request o2oa/o2oa!4161

(cherry picked from commit db9feba7)

e668e891 Merge branch 'fix/jira_mobile_bug' into 'wrdp'

bbs-添加手动获取应用市场应用列表的服务

See merge request o2oa/o2oa!4124

Merge branch 'fix/Process.applications' into 'wrdp'

See merge request o2oa/o2oa!4154

Merge of fix/Process.applications 修复流程管理界面报错的问题 to release

See merge request o2oa/o2oa!4153

(cherry picked from commit eddcbe94)

170fa573 修复流程管理界面报错的问题

Merge branch '待阅查询改为record' into 'wrdp'

See merge request o2oa/o2oa!4150

[流程平台]待阅查询改为record

See merge request o2oa/o2oa!4146

(cherry picked from commit 0ddfb928)

a407223f 待阅查询改为record

Merge branch 'feature/审计日志写入到消息中' into 'wrdp'

See merge request o2oa/o2oa!4147

[平台]审计日志写入到消息中，以便业务可以统一入口查询

See merge request o2oa/o2oa!4145

(cherry picked from commit 7057bcca)

d654036c 审计日志写入到消息中，以便业务可以统一入口查询

bbs修复不能重复提交的bug

See merge request o2oa/o2oa!4133

修复设计查找模块，由于自定义token名称而引起的错误

See merge request o2oa/o2oa!4138

(cherry picked from commit 48ddc124)

遗漏的未合并到java8的commit

See merge request o2oa/o2oa!4136