提交 · 748f4aeeeccbe75bfed85762cce3366f5be0a9de · fuyue82 / o2oa

28 2月, 2022 9 次提交
- 优化版式公文格式 · 748f4aee
  由 NoSubject 提交于 2月 28, 2022
```
(cherry picked from commit c48814a9)
```
  748f4aee
- 蔡
  Merge branch 'cherry-pick-51972676' into 'develop_java8' · b30a1238
  由蔡祥熠提交于 2月 28, 2022
```
Merge branch 'fix/statement_filter' into 'develop'

See merge request o2oa/o2oa!306
```
  b30a1238
- Merge branch 'cherry-pick-f21615f1' into 'develop_java8' · c3ec184e
  由 NoSubject 提交于 2月 28, 2022
```
手机端不切换新版办公中心

See merge request o2oa/o2oa!305
```
  c3ec184e
- 蔡
  Merge branch 'fix/statement_filter' into 'develop' · 8368bf69
  由蔡祥熠提交于 2月 28, 2022
```
Merge of fix/statement_filter 修复查询语句一个条件多个值的问题 to master

See merge request o2oa/o2oa!302

(cherry picked from commit 51972676)

6e3d02c2 修复查询语句一个条件多次判断的问题
29b1dcb3 修复查询语句一个条件多个值的问题
```
  8368bf69
- 手机端不切换新版办公中心 · e5e303d4
  由 NoSubject 提交于 2月 28, 2022
```
(cherry picked from commit f21615f1)
```
  e5e303d4
- Merge branch 'cherry-pick-f174f3df' into 'develop_java8' · 4612eb4d
  由 NoSubject 提交于 2月 28, 2022
```
修复ElementUI对选组件在设计端不显示的问题

See merge request o2oa/o2oa!300
```
  4612eb4d
- 修复ElementUI对选组件在设计端不显示的问题 · 262b2099
  由 NoSubject 提交于 2月 28, 2022
```
(cherry picked from commit f174f3df)
```
  262b2099
- Merge branch 'cherry-pick-2662f0b7' into 'develop_java8' · 8b875d78
  由 NoSubject 提交于 2月 28, 2022
```
修复版式文件签发人脚本计算错误

See merge request o2oa/o2oa!297
```
  8b875d78
- 修复版式文件签发人脚本计算错误 · 44156a26
  由 NoSubject 提交于 2月 28, 2022
```
(cherry picked from commit 2662f0b7)
```
  44156a26
27 2月, 2022 4 次提交
- Merge branch 'cherry-pick-370010da' into 'develop_java8' · 82b53b8e
  由 NoSubject 提交于 2月 27, 2022
```
修复cms表单设计中滚动条丢失的问题，修复Elementui组件重复显示问题

See merge request o2oa/o2oa!294
```
  82b53b8e
- 修复cms表单设计中滚动条丢失的问题，修复Elementui组件重复显示问题 · 4a7535cd
  由 NoSubject 提交于 2月 27, 2022
```
(cherry picked from commit 370010da)
```
  4a7535cd
- Merge branch 'cherry-pick-eff877d6' into 'develop_java8' · eb513387
  由 NoSubject 提交于 2月 27, 2022
```
表格设计宽度过大时增加滚动条

See merge request o2oa/o2oa!291
```
  eb513387
- 表格设计宽度过大时增加滚动条 · 79d34128
  由 NoSubject 提交于 2月 27, 2022
```
(cherry picked from commit eff877d6)
```
  79d34128
25 2月, 2022 20 次提交
- 蔡
  Merge branch 'cherry-pick-67baff80' into 'develop_java8' · 4da7b8db
  由蔡祥熠提交于 2月 25, 2022
```
Merge branch 'hotfix/formula_donot_inTable' into 'master'

See merge request o2oa/o2oa!289
```
  4da7b8db
- 蔡
  Merge branch 'hotfix/formula_donot_inTable' into 'master' · d2ed7f1e
  由蔡祥熠提交于 2月 25, 2022
```
Merge of hotfix/formula_donot_inTable 修复脚本不能放在表格中的问题 to master

See merge request o2oa/o2oa!287

(cherry picked from commit 67baff80)

aa8a3d45 修复脚本不能放在表格中的问题
```
  d2ed7f1e
- 蔡
  Merge branch 'cherry-pick-73311f9b' into 'develop_java8' · d72dd071
  由蔡祥熠提交于 2月 25, 2022
```
Merge branch 'cherry-pick-a16dd9de' into 'develop'

See merge request o2oa/o2oa!284
```
  d72dd071
- Merge branch 'cherry-pick-69c71d70' into 'develop_java8' · a6fcd173
  由 NoSubject 提交于 2月 25, 2022
```
修复版本号

See merge request o2oa/o2oa!286
```
  a6fcd173
- 修复版本号 · 6194ea9f
  由 NoSubject 提交于 2月 25, 2022
```
(cherry picked from commit 69c71d70)
```
  6194ea9f
- 蔡
  Merge branch 'cherry-pick-a16dd9de' into 'develop' · 25366945
  由蔡祥熠提交于 2月 25, 2022
```
Merge branch 'hotfix/formula_donot_inTable' into 'master'

See merge request o2oa/o2oa!282

(cherry picked from commit 73311f9b)

34203cd7 Merge branch 'hotfix/formula_donot_inTable' into 'master'
```
  25366945
- Merge branch 'cherry-pick-7e5021e9' into 'develop_java8' · 39d2b28c
  由 NoSubject 提交于 2月 25, 2022
```
修改密码加密和日程管理xss漏洞修复

See merge request o2oa/o2oa!281
```
  39d2b28c
- 修改密码加密和日程管理xss漏洞修复 · 068916b9
  由 NoSubject 提交于 2月 25, 2022
```
(cherry picked from commit 7e5021e9)
```
  068916b9
- 楼
  Merge branch 'dev8_merge_lgd' into 'develop_java8' · 2fdc73e9
  由楼国栋提交于 2月 25, 2022
```
百度地图jsapi bug处理

See merge request o2oa/o2oa!278
```
  2fdc73e9
- F
  
  百度地图jsapi bug处理 · 5a0a9f0c
  由 fancy 提交于 2月 25, 2022
  
  5a0a9f0c
- O
  Merge branch 'cherry-pick-1a0363fc' into 'develop_java8' · daaa8e67
  由 o2null 提交于 2月 25, 2022
```
默认缓存策略改为guava

See merge request o2oa/o2oa!277
```
  daaa8e67
- R
  默认缓存策略改为guava · e744a954
  由 Ray 提交于 2月 25, 2022
```
(cherry picked from commit 1a0363fc)
```
  e744a954
- O
  Merge branch 'cherry-pick-2af8c6e9' into 'develop_java8' · 42d1244e
  由 o2null 提交于 2月 25, 2022
```
Merge branch '内容管理文档点赞与评论点赞合并' into 'develop'

See merge request o2oa/o2oa!273
```
  42d1244e
- O
  Merge branch '内容管理文档点赞与评论点赞合并' into 'develop' · bcf9b57b
  由 o2null 提交于 2月 25, 2022
```
内容管理文档点赞与评论点赞合并

See merge request o2oa/o2oa!253

(cherry picked from commit 2af8c6e9)

c1ff3f3b 内容管理文档点赞与评论点赞合并
64bf563a 内容管理文档点赞与评论点赞合并2
```
  bcf9b57b
- O
  Merge branch 'cherry-pick-6131aaeb' into 'develop_java8' · 9b614520
  由 o2null 提交于 2月 25, 2022
```
Merge branch 'feat/qrcode' into 'develop'

See merge request o2oa/o2oa!272
```
  9b614520
- O
  Merge branch 'feat/qrcode' into 'develop' · d2121698
  由 o2null 提交于 2月 25, 2022
```
Feat/qrcode

See merge request o2oa/o2oa!271

(cherry picked from commit 6131aaeb)

b86a35a4 通用服务中增加二维码生成接口
f4cd7adb Update service_linux.sh
```
  d2121698
- Merge branch 'cherry-pick-0d0a0d77' into 'develop_java8' · 786d7401
  由 NoSubject 提交于 2月 25, 2022
```
API中增加活动自定义属性描述

See merge request o2oa/o2oa!270
```
  786d7401
- API中增加活动自定义属性描述 · d653f30d
  由 NoSubject 提交于 2月 25, 2022
```
(cherry picked from commit 0d0a0d77)
```
  d653f30d
- Merge branch 'cherry-pick-839881d5' into 'develop_java8' · 2421ee2b
  由 NoSubject 提交于 2月 25, 2022
```
请求时去除token请求头

See merge request o2oa/o2oa!268
```
  2421ee2b
- 请求时去除token请求头 · ae1570bd
  由 NoSubject 提交于 2月 25, 2022
```
(cherry picked from commit 839881d5)
```
  ae1570bd
24 2月, 2022 7 次提交
- Merge branch 'cherry-pick-3fd3f553' into 'develop_java8' · 0e5140fd
  由 NoSubject 提交于 2月 24, 2022
```
查询语句视图配置字段大小加大

See merge request o2oa/o2oa!266
```
  0e5140fd
- O
  查询语句视图配置字段大小加大 · c18d1c2c
  由 o2sword 提交于 2月 24, 2022
```
(cherry picked from commit a653bba1)

(cherry picked from commit 3fd3f553)
```
  c18d1c2c
- Merge branch 'cherry-pick-6b3eb00f' into 'develop_java8' · c25824e4
  由 NoSubject 提交于 2月 24, 2022
```
ELButton图标显示问题

See merge request o2oa/o2oa!262
```
  c25824e4
- ELButton图标显示问题 · 6497485b
  由 NoSubject 提交于 2月 24, 2022
```
(cherry picked from commit 6b3eb00f)
```
  6497485b
- 蔡
  Merge branch 'cherry-pick-8ee8fc6b' into 'develop_java8' · c42f7ad2
  由蔡祥熠提交于 2月 24, 2022
```
Merge branch 'fix/submitForm' into 'develop'

See merge request o2oa/o2oa!258
```
  c42f7ad2
- 蔡
  Merge branch 'fix/submitForm' into 'develop' · 9fa89a46
  由蔡祥熠提交于 2月 24, 2022
```
Merge of fix/submitForm 修复提交子表单不能选择的问题 to develop

See merge request o2oa/o2oa!257

(cherry picked from commit 8ee8fc6b)

d5b1eba1 修复提交子表单不能选择的问题
```
  9fa89a46
- Merge branch 'cherry-pick-7b8c8358' into 'develop_java8' · 52a69eb9
  由 NoSubject 提交于 2月 24, 2022
```
修复重复请求同步时的callback执行

See merge request o2oa/o2oa!255
```
  52a69eb9

fuyue82 / o2oa 与 Fork 源项目一致

fuyue82 / o2oa
与 Fork 源项目一致