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

See merge request o2oa/o2oa!359

(cherry picked from commit 2192dd12)

5fb74f8c 视图、查询视图数据中增加序号，修复查询视图搜索条件为数字时报错的问题

Merge branch '内容管理增加是否全员推送的配置' into 'develop'

See merge request o2oa/o2oa!357

内容管理增加是否全员推送的配置

See merge request o2oa/o2oa!352

(cherry picked from commit 533cf2fc)

5f581c8b 内容管理增加是否全员推送的配置
ef1a2e31 首页图片改为4张

修改arriveAfterScript和inquireAfterScript

See merge request o2oa/o2oa!356

(cherry picked from commit 9d23621f)

钉钉消息增加cms文档打开功能 java8

See merge request o2oa/o2oa!354

钉钉消息增加cms文档打开功能

See merge request o2oa/o2oa!353

(cherry picked from commit 8712ecce)

1d99de0e 钉钉消息增加cms文档打开功能

Merge branch 'fix/cms.category' into 'develop'

See merge request o2oa/o2oa!351

Merge of fix/cms.category 文档发布范围为空时是否全员通知 to develop

See merge request o2oa/o2oa!350

(cherry picked from commit a0046130)

4e6aedc1 文档发布范围为空时是否全员通

Merge branch 'hotfix/org_promise' into 'master'

See merge request o2oa/o2oa!349

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

See merge request o2oa/o2oa!347

(cherry picked from commit 66cf712d)

8d5185d5 修复人员选择组件异步模式选择后描述文字未隐藏的问题

修正completed的表示值

See merge request o2oa/o2oa!346

(cherry picked from commit dec0addf)

(cherry picked from commit 0dc574d8)

微信公众号接收文本消息后脚本处理 java8

See merge request o2oa/o2oa!343

微信公众号接收文本消息后脚本处理

See merge request o2oa/o2oa!342

(cherry picked from commit a3c00ce3)

3f0a7bd0 微信公众号上传素材
b5d93747 微信公众号接收文本消息后脚本处理
3d7f3ef0 执行脚本需要返回success

Merge branch 'feature/system_config' into 'develop'

See merge request o2oa/o2oa!341

Feature/system config

See merge request o2oa/o2oa!340

(cherry picked from commit 0067e099)

9246673e 修复不支持浏览器的提示
d384ddd0 将elementui组件加入到数据表格中-elinput，elcheckbox,elselect
3e09e4b6 允许elementUI组件用于数据表格

增加after事件可以保存data

See merge request o2oa/o2oa!336

(cherry picked from commit ed55bad9)

Merge branch '内容管理返回评论列表中增加是否点赞' into 'develop'

See merge request o2oa/o2oa!334

内容管理返回评论列表中增加是否点赞

See merge request o2oa/o2oa!329

(cherry picked from commit 1a4699aa)

3e965cab 内容管理返回评论列表中增加是否点赞

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

See merge request o2oa/o2oa!332

hotfix/修复消息执行脚本异常 同时合并到master

See merge request o2oa/o2oa!328

(cherry picked from commit ccb1807a)

0c6480ec 修复消息执行脚本异常

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

See merge request o2oa/o2oa!330

hotfix/修复windows自建表编译后不生效的问题 同时合并到master

See merge request o2oa/o2oa!321

(cherry picked from commit 22ed6200)

36d914e9 修复windows自建表编译后不生效的问题

Merge branch 'hotfix/api' into 'master'

See merge request o2oa/o2oa!327

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

See merge request o2oa/o2oa!323

(cherry picked from commit c6fc749d)

2012fdaa 修复api的问题

Merge branch 'hotfix/api' into 'master'

See merge request o2oa/o2oa!325

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

See merge request o2oa/o2oa!322

(cherry picked from commit 9dc76c5d)

e411d1ed 修复api的问题

表单预览showjson增加滚动条

See merge request o2oa/o2oa!320

(cherry picked from commit 025b9f6e)

Merge branch 'hotfix/api' into 'master'

See merge request o2oa/o2oa!318

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

See merge request o2oa/o2oa!316

(cherry picked from commit 82e0542b)

2282ac0e 修复桌面模式流程readonly双击到浏览器页面上打开可以编辑

增加查询语句执行原生查询sql的接口

See merge request o2oa/o2oa!314

(cherry picked from commit 50bfe315)

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

See merge request o2oa/o2oa!313

(cherry picked from commit be883e4a)

Merge branch 'feat/gc' into 'develop'

See merge request o2oa/o2oa!312

Feat/gc

See merge request o2oa/o2oa!311

(cherry picked from commit b8ff3dc8)

4d7c30b9 添加jpql debugger
a3765e15 Merge branch 'develop' of https://git.o2oa.net/o2oa/o2oa into develop
c321d7a7 增加ctl -gc
5dbf60ca clear

优化版式公文格式

See merge request o2oa/o2oa!310