(cherry picked from commit 1e87f2a6)

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

See merge request o2oa/o2oa!4342

Merge of fix/Process.submit_handwrit 处理数据表格总计小数点保留位数的问题 to wrdp

See merge request o2oa/o2oa!4340

(cherry picked from commit 8e46991f)

431bd410 处理数据表格小数点保留位数的问题
366465d5 处理数据表格小数点保留位数的问题

Update template.json

See merge request o2oa/o2oa!4336

(cherry picked from commit 8530678d)

Merge branch 'feature/requestLog' into 'wrdp'

See merge request o2oa/o2oa!4330

修改requestLogRetainDays字段

See merge request o2oa/o2oa!4329

(cherry picked from commit 029f7abe)

9f4a7bec 修改requestLogRetainDays字段

Merge branch 'feature/requestLog' into 'wrdp'

See merge request o2oa/o2oa!4326

增加 request log 功能

See merge request o2oa/o2oa!4325

(cherry picked from commit 83700633)

a451a6c2 增加 request log 功能

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

See merge request o2oa/o2oa!4321

Merge of fix/Process.setData to wrdp

See merge request o2oa/o2oa!4320

(cherry picked from commit fe6c7a23)

6fef7c5e 修复originalData更新的问题

Merge branch 'fix/cms.module' into 'wrdp'

See merge request o2oa/o2oa!4315

Merge of fix/cms.module 修复内容管理模块的一个语言错误 to wrdp

See merge request o2oa/o2oa!4314

(cherry picked from commit 064a618e)

2efd90d7 修复内容管理模块的一个语言错误

Merge branch 'fix/cms.module' into 'wrdp'

See merge request o2oa/o2oa!4311

Merge of fix/cms.module 修复内容管理模块的一个语言错误 to wrdp

See merge request o2oa/o2oa!4310

(cherry picked from commit 556f94e4)

cb883aa8 修复内容管理模块的一个语言错误
af654259 修复内容管理模块的一个语言错误
0902a286 修复内容管理模块的一个语言错误

UnitListObject改为多线程执行

See merge request o2oa/o2oa!4305

Merge branch 'fix/proxydecode' into 'wrdp'

See merge request o2oa/o2oa!4302

修正java8decode不能使用对象作为参数

See merge request o2oa/o2oa!4301

(cherry picked from commit 25d088e5)

9a924c97 修正java8decode不能使用对象作为参数

java8 pom add hadoop client

See merge request o2oa/o2oa!4299

modify org's en

See merge request o2oa/o2oa!4293

(cherry picked from commit 7413e291)

Merge branch 'feature/hdfs_java11' into 'wrdp'

See merge request o2oa/o2oa!4290

重新提交

See merge request o2oa/o2oa!4289

(cherry picked from commit 46de198c)

05c9f2b5 重新提交

阅读记录地址改为readrecord

See merge request o2oa/o2oa!4285

(cherry picked from commit b63f4c15)

Merge branch 'fix/Query.ViewDesign_notice' into 'wrdp'

See merge request o2oa/o2oa!4275

Merge of fix/Query.ViewDesign_notice to wrdp

See merge request o2oa/o2oa!4274

(cherry picked from commit f5f2efe0)

91ac3f09 视图中增加对流程、栏目和时段的填写校验

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

See merge request o2oa/o2oa!4269

Merge of fix/Process.form_datatable 修复数据表格滚动条问题、修复查询语句操作条问题 to wrdp

See merge request o2oa/o2oa!4268

(cherry picked from commit 696321fe)

15a81f99 修复数据表格滚动条的问题
491437bc 修复查询语句操作条的问题

Merge branch 'feature/assistantGet' into 'wrdp'

See merge request o2oa/o2oa!4264

增加proxy代理servlet

See merge request o2oa/o2oa!4263

(cherry picked from commit 759c1f60)

45bf9f75 增加proxy代理servlet

Merge branch 'fix/app端支持平台token名字的修改' into 'wrdp'

See merge request o2oa/o2oa!4260

[平台]app端支持平台token名字的修改

See merge request o2oa/o2oa!4256

(cherry picked from commit f8234f44)

b771b6b9 app端支持平台token名字的修改

Merge branch 'fix/流程中引入脚本在脚本更新后缓存为更新的问题' into 'wrdp'

See merge request o2oa/o2oa!4257

[流程平台]修复流程中引入脚本在脚本更新后缓存未更新的问题

See merge request o2oa/o2oa!4255

(cherry picked from commit ea4e2846)

95f478a2 修复流程中引入脚本在脚本更新后缓存为更新的问题

增加显示系统版本号 develop_java8

See merge request o2oa/o2oa!4253

增加显示系统版本号

See merge request o2oa/o2oa!4030

(cherry picked from commit ea802549)

d2ed8ea6 增加显示系统版本号

Merge branch 'fix/自建表数据导入失败数目没有的问题' into 'wrdp'

See merge request o2oa/o2oa!4250