提交 · a044a85145adf15d3f265dfe9ae1ac2232a6159f · weixin_42566577 / o2oa

25 3月, 2020 4 次提交
- O
  Revert "Merge branch 'fix/group_as_read' into 'master'" · a044a851
  由 o2null 提交于 3月 25, 2020
```
This reverts merge request !123
```
  a044a851
- O
  Merge branch 'fix/group_as_read' into 'master' · 03a1005d
  由 o2null 提交于 3月 25, 2020
```
Fix/group as read

See merge request o2oa/o2oa!123
```
  03a1005d
- O
  Merge branch 'master' into 'fix/group_as_read' · 4d92926a
  由 o2null 提交于 3月 25, 2020
```
# Conflicts:
#   .gitignore
#   o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionAssignCreate.java
```
  4d92926a
- Z
  
  线程执行修复 · 897d0b63
  由 Zhou Rui 提交于 3月 25, 2020
  
  897d0b63
24 3月, 2020 33 次提交
- O
  Merge branch 'hotfix/pom' into 'master' · 0b6903ae
  由 o2null 提交于 3月 24, 2020
```
修改pom

See merge request o2oa/o2oa!118
```
  0b6903ae
- Z
  
  修改pom · 4972f5e9
  由 Zhou Rui 提交于 3月 24, 2020
  
  4972f5e9
- Z
  
  修改jpush · 8f1c351e
  由 Zhou Rui 提交于 3月 24, 2020
  
  8f1c351e
- O
  Merge branch 'fix/codeformat' into 'develop' · 937f217c
  由 o2null 提交于 3月 24, 2020
```
代码错误.

See merge request o2oa/o2oa!117
```
  937f217c
- Z
  
  代码错误. · 6ce10d70
  由 Zhou Rui 提交于 3月 24, 2020
  
  6ce10d70
- O
  Merge branch 'hotfix/passExpired' into 'master' · 173375f2
  由 o2null 提交于 3月 24, 2020
```
Hotfix/pass expired

See merge request o2oa/o2oa!116
```
  173375f2
- Z
  
  Merge branch 'master' of https://git.o2oa.net/o2oa/o2oa · 5c07f5dc
  由 Zhou Rui 提交于 3月 24, 2020
  
  5c07f5dc
- O
  Merge branch 'fix/exceptionPassExpired' into 'develop' · 2ca75d9b
  由 o2null 提交于 3月 24, 2020
```
Fix/exception pass expired

See merge request o2oa/o2oa!115
```
  2ca75d9b
- Z
  
  修正报错的提示信息. · 1708e4bd
  由 Zhou Rui 提交于 3月 24, 2020
  
  1708e4bd
- Z
  
  Merge branch 'develop' of https://git.o2oa.net/o2oa/o2oa into develop · f2fcf7f8
  由 Zhou Rui 提交于 3月 24, 2020
  
  f2fcf7f8
- O
  Merge branch 'fix/passExpired' into 'develop' · e0d40bc2
  由 o2null 提交于 3月 24, 2020
```
Fix/pass expired

See merge request o2oa/o2oa!114
```
  e0d40bc2
- Z
  
  修正自动流转错误. · 67d8291a
  由 Zhou Rui 提交于 3月 24, 2020
  
  67d8291a
- Merge branch 'hotfix/cms.document_publish' into 'master' · 12622e8d
  由 liyi_hz2008 提交于 3月 24, 2020
```
Merge of hotfix/hotfix/cms.document_publish to master

See merge request o2oa/o2oa!113
```
  12622e8d
- BUG修复：修复信息发布里发布内容时附件无法显示，草稿功能异常的问题 · 90c0344e
  由 liyi_hz2008 提交于 3月 24, 2020
  
  90c0344e
- Merge branch 'fix/start_process_search' into 'develop' · cc2cd6ed
  由 NoSubject 提交于 3月 24, 2020
```
Merge of fix/start_process_search to develop

See merge request o2oa/o2oa!112
```
  cc2cd6ed
- O
  Merge branch 'hotfix/embed' into 'develop' · 22042c80
  由 o2null 提交于 3月 24, 2020
```
修改embed调用线程错误.

See merge request o2oa/o2oa!111
```
  22042c80
- O
  Merge branch 'hotfix/embed' into 'master' · 993702ea
  由 o2null 提交于 3月 24, 2020
```
修改embed调用线程错误.

See merge request o2oa/o2oa!109
```
  993702ea
- Z
  
  修改embed调用线程错误. · e13e3c87
  由 Zhou Rui 提交于 3月 24, 2020
  
  e13e3c87
- Z
  
  修改embed的调用错误. · 44aafeb9
  由 Zhou Rui 提交于 3月 24, 2020
  
  44aafeb9
- 蔡
  Merge branch 'fix/Selector.category_item_height_exception' into 'develop' · 455d3b50
  由蔡祥熠提交于 3月 24, 2020
```
Merge of fix/Selector.category_item_height_exception to develop

See merge request o2oa/o2oa!106
```
  455d3b50
- U
  
  修复选人的时候高度的问题 · fd2295e8
  由 unknown 提交于 3月 24, 2020
  
  fd2295e8
- Merge branch 'hotfix/startProcess_search' into 'develop' · 2130943f
  由 NoSubject 提交于 3月 24, 2020
```
Merge of hotfix/startProcess_search to develop

See merge request o2oa/o2oa!105
```
  2130943f
- Merge branch 'hotfix/startProcess_search' into 'master' · e8cc5eb8
  由 NoSubject 提交于 3月 24, 2020
```
Merge of hotfix/startProcess_search to master

See merge request o2oa/o2oa!104
```
  e8cc5eb8
- fix process start search · 818c64b0
  由 NoSubject 提交于 3月 24, 2020
  
  818c64b0
- Z
  
  Merge branch 'develop' of https://git.o2oa.net/o2oa/o2oa into develop · fc4d88ae
  由 Zhou Rui 提交于 3月 24, 2020
  
  fc4d88ae
- Z
  
  修正自动流转无法触发的错误. · fe871c36
  由 Zhou Rui 提交于 3月 24, 2020
  
  fe871c36
- Merge branch 'fix/startProcess_search_error' into 'develop' · ea296384
  由 NoSubject 提交于 3月 24, 2020
```
Merge of fix/startProcess_search_error to develop

See merge request o2oa/o2oa!103
```
  ea296384
- fix process start search · 901b215b
  由 NoSubject 提交于 3月 24, 2020
  
  901b215b
- Merge branch 'hotfix/fix_logout_reload' into 'develop' · 0f8cb98f
  由 NoSubject 提交于 3月 24, 2020
```
Merge of hotfix/fix_logout_reload to develop

See merge request o2oa/o2oa!102
```
  0f8cb98f
- Merge branch 'hotfix/fix_logout_reload' into 'master' · 9bb26053
  由 NoSubject 提交于 3月 24, 2020
```
Merge of hotfix/fix_logout_reload to master

See merge request o2oa/o2oa!101
```
  9bb26053
- fix logout reload. delete authentication http request · 681a37b0
  由 NoSubject 提交于 3月 24, 2020
  
  681a37b0
- 蔡
  Merge branch 'fix/Forum.getServiceAccessError' into 'develop' · 6b89c056
  由蔡祥熠提交于 3月 24, 2020
```
Merge of fix/Forum.getServiceAccessError to develop

See merge request o2oa/o2oa!100
```
  6b89c056
- U
  
  修复论坛注销不正常的问题 · a6f6f1a1
  由 unknown 提交于 3月 24, 2020
  
  a6f6f1a1
23 3月, 2020 3 次提交
- Merge branch 'fix/ci_build' into 'develop' · 1a928e29
  由 NoSubject 提交于 3月 23, 2020
```
Merge of fix/ci_build to develop

See merge request o2oa/o2oa!99
```
  1a928e29
- fix gulpfile response error · 4739d5f0
  由 NoSubject 提交于 3月 23, 2020
  
  4739d5f0
- Merge branch 'feature/TeamWork.addServiceTransWorkToSubWork' into 'develop' · 5d808196
  由 liyi_hz2008 提交于 3月 23, 2020
```
Merge of feature/TeamWork.addServiceTransWorkToSubWork to develop

See merge request o2oa/o2oa!98
```
  5d808196

weixin_42566577 / o2oa 与 Fork 源项目一致

weixin_42566577 / o2oa
与 Fork 源项目一致