提交 · ac70e3412f2b4461237064c21c478385bc336b82 · 浙江兰德纵横网络技术股份有限公司 / o2oa

21 1月, 2021 3 次提交
- Merge branch 'fix/api_v' into 'wrdp' · ac70e341
  由 NoSubject 提交于 1月 21, 2021
```
修改gulp打包版本号获取

See merge request o2oa/o2oa!2830

(cherry picked from commit fa61ffa6)

b5e6f511 修改gulp打包版本号获取
```
  ac70e341
- 蔡
  Merge branch 'fix/JSDoc.cuobiezi' into 'release' · 579cadd8
  由蔡祥熠提交于 1月 21, 2021
```
Merge of fix/JSDoc.cuobiezi to release

See merge request o2oa/o2oa!2826
```
  579cadd8
- U
  
  jsdoc · b207197d
  由 unknown 提交于 1月 21, 2021
  
  b207197d
20 1月, 2021 6 次提交

Merge branch 'cherry-pick-f7568b40' into 'release' · 3a09ddfd
由 NoSubject 提交于 1月 20, 2021
```
Merge branch 'fix/api_v' into 'wrdp'

See merge request o2oa/o2oa!2823
```
3a09ddfd

Merge branch 'fix/api_v' into 'wrdp' · 29d59a99

由 NoSubject 提交于 1月 20, 2021

修改gulp打包版本号获取

See merge request o2oa/o2oa!2822

(cherry picked from commit f7568b40)

20645313 修改gulp打包版本号获取

29d59a99

Merge branch 'cherry-pick-43f97be3' into 'release' · 5b674d7d
由 NoSubject 提交于 1月 20, 2021
```
Merge branch 'feature/invoke_power' into 'wrdp'

See merge request o2oa/o2oa!2815
```
5b674d7d

Merge branch 'feature/invoke_power' into 'wrdp' · b9bda305

由 NoSubject 提交于 1月 20, 2021

服务调用的鉴权功能

See merge request o2oa/o2oa!2814

(cherry picked from commit 43f97be3)

da307844 服务调用的鉴权功能
72c4e087 Merge branch 'wrdp' into 'feature/invoke_power'

b9bda305

蔡
Merge branch 'cherry-pick-f9f50bc7' into 'release' · d5c6eb03
由蔡祥熠提交于 1月 20, 2021
```
Merge branch 'fix/Process.datagrid_execption' into 'wrdp'

See merge request o2oa/o2oa!2812
```
d5c6eb03

蔡

Merge branch 'fix/Process.datagrid_execption' into 'wrdp' · 6e4ce4a8

由蔡祥熠提交于 1月 20, 2021

Merge of fix/Process.datagrid_execption 修复数据网格组织组件中的BUG to wrdp

See merge request o2oa/o2oa!2809

(cherry picked from commit f9f50bc7)

7a8a2c6e 修复数据网格
f55bf952 修复数据网格
40256db5 修复数据网格

6e4ce4a8

19 1月, 2021 31 次提交
- Merge branch 'wrdp' into 'develop' · 2d2c2177
  由 NoSubject 提交于 1月 19, 2021
```
Wrdp

See merge request o2oa/o2oa!2796
```
  2d2c2177
- Merge branch 'fix/gulp_v' into 'wrdp' · 6c5c47de
  由 NoSubject 提交于 1月 19, 2021
```
修复组织控件职务默认值不正确的问题

See merge request o2oa/o2oa!2795
```
  6c5c47de
- 修复组织控件职务默认值不正确的问题 · f3db09a1
  由 NoSubject 提交于 1月 19, 2021
  
  f3db09a1
- Merge branch 'wrdp' into 'develop' · d41edf96
  由 NoSubject 提交于 1月 19, 2021
```
Wrdp

See merge request o2oa/o2oa!2794
```
  d41edf96
- Merge branch 'fix/gulp_v' into 'wrdp' · 96862919
  由 NoSubject 提交于 1月 19, 2021
```
修复组织控件职务默认值不正确的问题

See merge request o2oa/o2oa!2793
```
  96862919
- 修复组织控件职务默认值不正确的问题 · 783d7018
  由 NoSubject 提交于 1月 19, 2021
  
  783d7018
- Merge branch 'wrdp' into 'develop' · ee933005
  由 NoSubject 提交于 1月 19, 2021
```
Wrdp

See merge request o2oa/o2oa!2792
```
  ee933005
- Merge branch 'fix/gulp_v' into 'wrdp' · 531aced4
  由 NoSubject 提交于 1月 19, 2021
```
修改gulp打包版本号获取

See merge request o2oa/o2oa!2791
```
  531aced4
- 修改gulp打包版本号获取 · 7bea29d9
  由 NoSubject 提交于 1月 19, 2021
  
  7bea29d9
- Merge branch 'wrdp' into 'develop' · 60166116
  由 NoSubject 提交于 1月 19, 2021
```
Wrdp

See merge request o2oa/o2oa!2790
```
  60166116
- Merge branch 'fix/gulp_v' into 'wrdp' · da29bea0
  由 NoSubject 提交于 1月 19, 2021
```
修改gulp打包版本号获取

See merge request o2oa/o2oa!2789
```
  da29bea0
- 修改gulp打包版本号获取 · 9cdb8c3f
  由 NoSubject 提交于 1月 19, 2021
  
  9cdb8c3f
- Merge branch 'wrdp' into 'develop' · 2ab0908b
  由 NoSubject 提交于 1月 19, 2021
```
Wrdp

See merge request o2oa/o2oa!2787
```
  2ab0908b
- Merge branch 'fix/org_duty' into 'wrdp' · eafe5399
  由 NoSubject 提交于 1月 19, 2021
```
修复组织控件职务默认值不正确的问题

See merge request o2oa/o2oa!2786
```
  eafe5399
- 修复组织控件职务默认值不正确的问题 · 7cfc77b5
  由 NoSubject 提交于 1月 19, 2021
  
  7cfc77b5
- O
  Merge branch 'wrdp' into 'develop' · 41d92c41
  由 o2null 提交于 1月 19, 2021
```
Wrdp

See merge request o2oa/o2oa!2785
```
  41d92c41
- O
  Merge branch 'fix/invoke_token' into 'wrdp' · 98fa70ca
  由 o2null 提交于 1月 19, 2021
```
改为通过sso配置进行验证

See merge request o2oa/o2oa!2784
```
  98fa70ca
- O
  Merge branch 'fix/根据职务查询身份信息接口修改' into 'wrdp' · 4e7973c1
  由 o2null 提交于 1月 19, 2021
```
[人员组织]根据职务查询身份信息接口修改

See merge request o2oa/o2oa!2776
```
  4e7973c1
- Z
  
  改为通过sso配置进行验证 · 87552363
  由 zhourui 提交于 1月 19, 2021
  
  87552363
- Merge branch 'wrdp' into 'develop' · 1eade388
  由 NoSubject 提交于 1月 19, 2021
```
Wrdp

See merge request o2oa/o2oa!2782
```
  1eade388
- Merge branch 'release' into 'develop' · 28bbe676
  由 NoSubject 提交于 1月 19, 2021
```
Release

See merge request o2oa/o2oa!2781
```
  28bbe676
- Merge branch 'cherry-pick-cd61cdf7' into 'release' · 605eea88
  由 NoSubject 提交于 1月 19, 2021
```
Merge branch 'fix/npm_api' into 'wrdp'

See merge request o2oa/o2oa!2780
```
  605eea88
- Merge branch 'fix/npm_api' into 'wrdp' · b33e0b2c
  由 NoSubject 提交于 1月 19, 2021
```
npm的build_web任务中增加API生成

See merge request o2oa/o2oa!2779

(cherry picked from commit cd61cdf7)

b6f5cda6 npm的build_web任务中增加API生成
```
  b33e0b2c
- Merge branch 'fix/npm_api' into 'wrdp' · cd61cdf7
  由 NoSubject 提交于 1月 19, 2021
```
npm的build_web任务中增加API生成

See merge request o2oa/o2oa!2779
```
  cd61cdf7
- npm的build_web任务中增加API生成 · b6f5cda6
  由 NoSubject 提交于 1月 19, 2021
  
  b6f5cda6
- O
  Merge branch 'wrdp' into 'develop' · 7d486bbd
  由 o2null 提交于 1月 19, 2021
```
Wrdp

See merge request o2oa/o2oa!2778
```
  7d486bbd
- O
  Merge branch 'fix/#449' into 'wrdp' · 0ee85f88
  由 o2null 提交于 1月 19, 2021
```
增加invoke安全令牌

See merge request o2oa/o2oa!2777
```
  0ee85f88
- O
  
  修改根据职务查询身份信息接口，返回身份信息的同时返回身份对应的职务 · 326fd4b8
  由 o2sword 提交于 1月 19, 2021
  
  326fd4b8
- Merge branch 'wrdp' into 'develop' · 81c831d9
  由 NoSubject 提交于 1月 19, 2021
```
Wrdp

See merge request o2oa/o2oa!2775
```
  81c831d9
- Merge branch 'fix/find_in_designer' into 'wrdp' · 5138580f
  由 NoSubject 提交于 1月 19, 2021
```
修复脚本提示bug

See merge request o2oa/o2oa!2774
```
  5138580f
- 修复脚本提示bug · 642df419
  由 NoSubject 提交于 1月 19, 2021
  
  642df419