Merge in CORE/base-third from ~LANLAN/base-third:release/10.0 to release/10.0
* commit 'b80e686ab2f74f1800ef68d2bf92295dcde1454b':
REPORT-28764 third包新增资源模块
Merge in CORE/base-third from ~ZHOUPING/base-third:release/10.0 to release/10.0
* commit 'e749fcaf2f010745bf31c29f88b62bee3e01e23c':
无JIRA任务 third pom优化
Merge in CORE/base-third from ~ZHOUPING/base-third:feature/10.0 to feature/10.0
* commit '169df5bc7e94a740bda3d670d92793d111010aa7':
无JIRA任务 third pom优化
Merge in CORE/base-third from ~HUGH.C/base-third:feature/10.0 to feature/10.0
* commit 'e9065db9555dc28aa65ec35998b4abf92398644d':
无jira任务,反向合代码引起的错误(堵塞打包)
Merge in CORE/base-third from ~ZED/base-third:release/10.0 to release/10.0
* commit 'd88b97f24712eed7a7aa387dbde11ca944af8d34':
fix
KERNEL-3899 集群下定时调度任务支持特定节点运行定时任务
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '4465d373639dad51dc11071cc7fb45fa314b4867':
无jira任务,反向合代码引起的错误(堵塞打包)
Merge in CORE/base-third from ~FENG/base-third:feature/10.0 to feature/10.0
* commit '803719f5876ad8528dd7f07899d49c104f10beb0':
KERNEL-3881 状态服务器+集群锁相关代码解耦,脱离依赖redis
Merge in CORE/base-third from ~HUGH.C/base-third:bugfix/10.0 to bugfix/10.0
* commit 'ebcd76423c37ad888772b5b98dd68529cf2425a0':
REPORT-31492 word导出中Html无法解析小于号(漏提)
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit 'afd604622c3db12c34b365254ea6686b9b04b261':
REPORT-31938 改进
REPORT-31938 html解析支持rgba
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit 'be04f46cfc4f23dd5e001b6ada4c6f69a976885e':
REPORT-29654 jgit 打包的时候少了 resources
Merge in CORE/base-third from ~ZHOUPING/base-third:feature/10.0 to feature/10.0
* commit '1737949fc3763fe6463629006677fbecdc80f6fa':
REPORT-28620 10.0扫描后quartz有漏洞
Merge in CORE/base-third from ~HUGH.C/base-third:bugfix/10.0 to bugfix/10.0
* commit '2b0774489afbf24f55859cfb95b40dcea1511909':
REPORT-31492 word导出中Html无法解析小于号
Merge in CORE/base-third from bugfix/10.0 to release/10.0
* commit '3ae4f48f6bf1eca94c9239f9b7b7694d2fe25cba':
REPORT-31421 间距设置导致切割后的HTML 含有line-height属性
Merge in CORE/base-third from ~HUGH.C/base-third:bugfix/10.0 to bugfix/10.0
* commit '7eb5d71ff4183f16d5ba897cdbabc8edd9ee2955':
REPORT-31421 间距设置导致切割后的HTML 含有line-height属性
Merge in CORE/base-third from ~FENG/base-third:feature/10.0 to feature/10.0
* commit '1e356bf449dfe9ec00441ffac467a8bc165796d0':
KERNEL-3881 状态服务器+集群锁相关代码解耦,脱离依赖redis
Merge in CORE/base-third from ~LIDONGY/base-third:release/10.0 to release/10.0
* commit '89c2c8e7ed4ce21e25e9fab7eeebd833b9c82910':
111
DEC-13199 websocket序列化时区设置
Merge in CORE/base-third from bugfix/10.0 to release/10.0
* commit 'f4d66414ae53802ea80752d2a940de0f68bcedb0':
REPORT-29182 & REPORT-29600 weblogic部署导出excel报错
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit 'f8adc802e3e9b1f755d09b913744571296173205':
REPORT-31053 PDF导出,<br>标签丢失