Merge in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0
* commit 'e580d48e62967b86fb0fab0719b3be1d839817a6':
REPORT-27207 表单填报,入库设置三个类型,设置后,显示问题
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit 'ee953baced5538c00de1ddec79d8e8273bdf209a':
修改地图散点标记点
删除静态变量
散点图标记点条件属性界面调整
CHART-13833 散点图标记点删除无,增加自动,调整标记点界面交互
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '82ae2412003008e5134e0fccb5ffd995e1998942':
REPORT-31315 新建cpt模板,随便输入了四个格子保存,但是显示不是测试模板
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '3e2daccbbc6e164112323f606258a7a2e33fbcc2':
REPORT-30557 fix name
REPORT-30557 fix name
REPORT-30557 【10.0.6】设计器启动类替换接口
Merge in DESIGN/design from ~BRUCE.DENG/design:release/10.0 to release/10.0
* commit '952f9ee6a277c2b636adfae5f1c8abdabf833905':
REPORT-31219 设计器打印边距需要支持负数设置
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit 'c37c5d39d8d5f4918c4be8d7fdab79d0e6a9936f':
REPORT-30735【10.0.6设计器内改动】frm组件名称规范统一
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '3b6ff4723792c6abfaa34f20efe49808f6c1d8cf':
CHART-13810 自定义组合图中仪表盘的图片替换
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '6038ec9c87a4d6f87b17f74cc81852ec079ee194':
CHART-13786 解决共用静态变量导致的自动标记点显示问题
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '6b1f8a513df8e915c60ccb6f9eb4ddad01bd916e':
修改变量名
CHART-13740 雷达图网格线支持线型选择
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit 'ed3540a09a8ee525cdce463941d16a5a721550ca':
删除instanceof判断
CHART-13733 折线图标记点新增自动