Merge of fix/captlogin 登录验证码去除缓存 to master

See merge request o2oa/o2oa!426

Merge of hotfix/datatable_upload 修复数据表格的附件移动端不能正常上传的问题 to master

See merge request o2oa/o2oa!391

Merge of hotfix/query.permission 修复查询视图和数据表执行人设置为身份的问题 to master

See merge request o2oa/o2oa!386

Merge of hotfix/Person_select 修复移动端身份选择后重新打开选项未被选中的问题 to master

See merge request o2oa/o2oa!367

Merge of fix/api_getattachment 修复api中获取附件的描述 to master

See merge request o2oa/o2oa!362

Merge of hotfix/query_search 视图、查询视图数据中增加序号，修复查询视图搜索条件为数字时报错的问题  to develop

See merge request o2oa/o2oa!359

Merge of hotfix/org_promise 修复人员选择组件异步模式选择后描述文字未隐藏的问题 to master

See merge request o2oa/o2oa!347

修正completed的表示值

See merge request o2oa/o2oa!344

允许elementUI组件用于数据表格

See merge request o2oa/o2oa!339

(cherry picked from commit 3e09e4b6)

将elementui组件加入到数据表格中-elinput，elcheckbox,elselect

See merge request o2oa/o2oa!338

(cherry picked from commit d384ddd0)

表单预览showjson增加滚动条

See merge request o2oa/o2oa!337

(cherry picked from commit 025b9f6e)

Merge branch 'cherry-pick-ccb1807a' into 'develop_java8'

See merge request o2oa/o2oa!333

Merge branch 'hotfix/修复消息执行脚本异常' into 'develop'

See merge request o2oa/o2oa!332

(cherry picked from commit 87b53b00)

462b564c Merge branch 'hotfix/修复消息执行脚本异常' into 'develop'

Merge branch 'cherry-pick-22ed6200' into 'develop_java8'

See merge request o2oa/o2oa!331

Merge branch 'hotfix/修复windows自建表编译后不生效的问题' into 'develop'

See merge request o2oa/o2oa!330

(cherry picked from commit 7db029f9)

460e550b Merge branch 'hotfix/修复windows自建表编译后不生效的问题' into 'develop'

Merge of hotfix/api 修复api职务描述不正确的问题 to master

See merge request o2oa/o2oa!323

Merge of hotfix/api 修复api职务描述不正确的问题 to master

See merge request o2oa/o2oa!322

Merge of hotfix/api 修复桌面模式流程readonly双击到浏览器页面上打开可以编辑 to develop

See merge request o2oa/o2oa!316

修复查询语句含join时参数映射不成功的问题

See merge request o2oa/o2oa!315

(cherry picked from commit be883e4a)

手机端不切换新版办公中心

See merge request o2oa/o2oa!307

(cherry picked from commit f21615f1)

Merge branch 'fix/statement_filter' into 'develop'

See merge request o2oa/o2oa!303

Merge of fix/statement_filter 修复查询语句一个条件多个值的问题 to master

See merge request o2oa/o2oa!302

(cherry picked from commit 51972676)

6e3d02c2 修复查询语句一个条件多次判断的问题
29b1dcb3 修复查询语句一个条件多个值的问题

修复ElementUI对选组件在设计端不显示的问题

See merge request o2oa/o2oa!301