修复o2web下gulp default编译o2.js合并的问题

See merge request o2oa/o2oa!1865

Merge branch 'fix/serial' into 'develop'

See merge request o2oa/o2oa!1863

Fix/serial

See merge request o2oa/o2oa!1862

(cherry picked from commit dc4954e9)

25da90a7 编号由流程改为应用
eb50f285 恢复ScriFactory

Merge of fix/Process.attachment_notice_level 修改附件超过大小的提示等级 to wrdp

See merge request o2oa/o2oa!1861

Merge branch 'fix/defaultWoText' into 'develop'

See merge request o2oa/o2oa!1859

默认text

See merge request o2oa/o2oa!1856

(cherry picked from commit 79fc3105)

c436e6b3 默认text

修改在线配置bug

See merge request o2oa/o2oa!1858

【cms】修复附件update权限判断错误的问题

See merge request o2oa/o2oa!1857

Fix/gulp default 修复o2web下gulp default编译o2.js合并的问题

See merge request o2oa/o2oa!1854

Merge of fix/Selector.selector_height 修复提交选人框可能看不到底框的问题 to wrdp

See merge request o2oa/o2oa!1853

Merge of fix/Selector.selector_width  修复提交选人框可能看不到已选框的问题 to wrdp

See merge request o2oa/o2oa!1852

Fix/bearer oauth

See merge request o2oa/o2oa!1849

【应用中心】修复导入应用覆盖时应用本身信息没有覆盖的问题

See merge request o2oa/o2oa!1845

修改钉钉,微信,WeLink同步的说明

See merge request o2oa/o2oa!1847

Merge of fix/Selector.select_duty_execption 修复选人组件某些情况下选择职务报500错的问题 to wrdp

See merge request o2oa/o2oa!1846

修改应用市场在firefox遮罩后不显示提示信息

See merge request o2oa/o2oa!1843

Merge branch 'fix/loadCustom_master' into 'master'

See merge request o2oa/o2oa!1840

修复未装载custom到jndi

See merge request o2oa/o2oa!1839

(cherry picked from commit 520271eb)

16db7134 修复未装载custom到jndi

【流程平台】修复一键下载文件标题包含特殊字符问题

See merge request o2oa/o2oa!1837

修复custom未装载到jndi中

See merge request o2oa/o2oa!1835

Merge of fix/smapsso_change 项目中待办回刷重定向参数的获取 to wrdp

See merge request o2oa/o2oa!1834

【考勤】修复多人同时打卡时后台更新数据锁死

See merge request o2oa/o2oa!1831