Merge branch 'fix/carousel' into 'wrdp'

See merge request o2oa/o2oa!6486

Merge of fix/carousel to wrdp

See merge request o2oa/o2oa!6485

(cherry picked from commit 5924f976)

64ea2d43 carousel

Merge branch 'feature/protal.Element' into 'wrdp'

See merge request o2oa/o2oa!6483

Merge of feature/protal.Element 在CMS、门户上加入Element的日期时间、评分、树、幻灯片、颜色选择、下拉菜单组件 to wrdp

See merge request o2oa/o2oa!6482

(cherry picked from commit fc08b485)

a5d60a46 在CMS、门户上加入Element的日期时间、评分、树、幻灯片、颜色选择、下拉菜单组件

Merge branch 'feature/element_Carousel' into 'wrdp'

See merge request o2oa/o2oa!6480

Merge of feature/element_Carousel 表单中加入了幻灯片组件 to wrdp

See merge request o2oa/o2oa!6479

(cherry picked from commit ea7a3f60)

9a3d6dcc element_carousel
def24ddc 走马灯
4a1ead89 幻灯片
071dbb31 element_走马灯
7c0db405 element幻灯片
ebda8390 走马灯
12203890 走马灯
3fa966a2 走马灯
afb2b0e9 走马灯
c7a0767d 走马灯
ef1212e2 走马灯
784ebaf3 走马灯

云文件附件上传下载优化合并到wrdp8

See merge request o2oa/o2oa!6477

# Conflicts:
#	o2server/configSample/jpushConfig.json
#	o2server/console_aix.sh
#	o2server/console_arm.sh
#	o2server/console_linux.sh
#	o2server/console_macos.sh
#	o2server/console_mips.sh
#	o2server/console_raspi.sh
#	o2server/console_windows.bat
#	o2server/pom.xml
#	o2server/x_attendance_assemble_control/pom.xml
#	o2server/x_attendance_core_entity/pom.xml
#	o2server/x_base_core_project/pom.xml
#	o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageObject.java
#	o2server/x_bbs_assemble_control/pom.xml
#	o2server/x_bbs_core_entity/pom.xml
#	o2server/x_calendar_assemble_control/pom.xml
#	o2server/x_calendar_core_entity/pom.xml
#	o2server/x_cms_assemble_control/pom.xml
#	o2server/x_cms_core_entity/pom.xml
#	o2server/x_cms_core_express/pom.xml
#	o2server/x_component_assemble_control/pom.xml
#	o2server/x_component_core_entity/pom.xml
#	o2server/x_console/pom.xml
#	o2server/x_file_assemble_control/pom.xml
#	o2server/x_file_core_entity/pom.xml
#	o2server/x_general_assemble_control/pom.xml
#	o2server/x_general_core_entity/pom.xml
#	o2server/x_hotpic_assemble_control/pom.xml
#	o2server/x_hotpic_core_entity/pom.xml
#	o2server/x_jpush_assemble_control/pom.xml
#	o2server/x_jpush_assemble_control/src/main/java/com/x/jpush/assemble/control/jaxrs/message/ActionSendMessage.java
#	o2server/x_jpush_core_entity/pom.xml
#	o2server/x_meeting_assemble_control/pom.xml
#	o2server/x_meeting_core_entity/pom.xml
#	o2server/x_message_assemble_communicate/pom.xml
#	o2server/x_message_core_entity/pom.xml
#	o2server/x_mind_assemble_control/pom.xml
#	o2server/x_mind_core_entity/pom.xml
#	o2server/x_organization_assemble_authentication/pom.xml
#	o2server/x_organization_assemble_control/pom.xml
#	o2server/x_organization_assemble_express/pom.xml
#	o2server/x_organization_assemble_personal/pom.xml
#	o2server/x_organization_core_entity/pom.xml
#	o2server/x_organization_core_express/pom.xml
#	o2server/x_portal_assemble_designer/pom.xml
#	o2server/x_portal_assemble_surface/pom.xml
#	o2server/x_portal_core_entity/pom.xml
#	o2server/x_processplatform_assemble_bam/pom.xml
#	o2server/x_processplatform_assemble_designer/pom.xml
#	o2server/x_processplatform_assemble_surface/pom.xml
#	o2server/x_processplatform_core_entity/pom.xml
#	o2server/x_processplatform_core_express/pom.xml
#	o2server/x_processplatform_service_processing/pom.xml
#	o2server/x_program_center/pom.xml
#	o2server/x_program_center_core_entity/pom.xml
#	o2server/x_query_assemble_designer/pom.xml
#	o2server/x_query_assemble_surface/pom.xml
#	o2server/x_query_core_entity/pom.xml
#	o2server/x_query_core_express/pom.xml
#	o2server/x_query_service_processing/pom.xml

数据库配置文件保存校验json异常修复

See merge request o2oa/o2oa!6476

(cherry picked from commit f183f02f)

考勤申诉审批查询bug wrdp8

See merge request o2oa/o2oa!6474

考勤申诉审批查询bug

See merge request o2oa/o2oa!6473

(cherry picked from commit 285c131e)

e618519b 考勤申诉审批查询bug

Merge branch 'fix/empower' into 'wrdp'

See merge request o2oa/o2oa!6470

Merge of fix/empower 修复提交时检查授权人员可能显示不全的问题 to wrdp

See merge request o2oa/o2oa!6469

(cherry picked from commit 1a38efa9)

28c62377 修复提交时检查授权人员可能显示不全的问题

Merge branch 'fix/managerProcess' into 'wrdp'

See merge request o2oa/o2oa!6467

Merge of fix/managerProcess  修复管理员提交校验了选人的问题 to wrdp

See merge request o2oa/o2oa!6466

(cherry picked from commit d0a168d6)

b1b9a863 修复管理员提交校验了选人的问题

Merge branch 'fix/Elselect_isReadonly' into 'wrdp'

See merge request o2oa/o2oa!6464

Merge of fix/Elselect_isReadonly 修复表单中地址选择的问题 to wrdp

See merge request o2oa/o2oa!6463

(cherry picked from commit 28468f25)

c71403cb 修复地址选择的问题
99462b41 修复地址选择的问题

Merge branch 'fix/api_source' into 'wrdp'

See merge request o2oa/o2oa!6461

Merge of fix/api_source 修复toPortal页面参数为空不能跳转的问题  to wrdp

See merge request o2oa/o2oa!6460

(cherry picked from commit e6030c8a)

d81f8b72 修复toPage页面参数为空不能跳转的问题

Merge of fix/api_source 修复toPortal页面参数为空不能跳转的问题  to wrdp

See merge request o2oa/o2oa!6460

Merge branch 'fix/api_source' into 'wrdp'

See merge request o2oa/o2oa!6458

Merge of fix/api_source api中增加source,subsource的别名 to wrdp

See merge request o2oa/o2oa!6457

(cherry picked from commit 99e6a4e9)

40ac8e30 api中增加source,subsource的别名

Merge of fix/api_source api中增加source,subsource的别名 to wrdp

See merge request o2oa/o2oa!6457

apk下载地址 urlmapping设置 wrdp8

See merge request o2oa/o2oa!6453

Merge branch 'fix/source' into 'wrdp'

See merge request o2oa/o2oa!6455

Merge of fix/source api添加getSource和currentEditedLine to wrdp

See merge request o2oa/o2oa!6454

(cherry picked from commit b0eeee17)

3e87f74e api添加getSource和currentEditedLine
7e6fa3b4 api添加getSource和currentEditedLine

Merge of fix/source api添加getSource和currentEditedLine to wrdp

See merge request o2oa/o2oa!6454

apk下载地址 urlmapping设置

See merge request o2oa/o2oa!6452

(cherry picked from commit 015e131b)

d8b22480 apk下载地址 urlmapping设置

apk下载地址 urlmapping设置

See merge request o2oa/o2oa!6452

应用市场通过官网cdn下载

See merge request o2oa/o2oa!6451

(cherry picked from commit bc884597)

(cherry picked from commit f44f5810)

应用市场通过官网cdn下载

See merge request o2oa/o2oa!6450

(cherry picked from commit bc884597)