Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/syc/slm/slmbi/service/impl/InstrumentPanelConfigServiceImpl.java

@@ -367,7 +367,10 @@ public class InstrumentPanelConfigServiceImpl extends ServiceImpl<InstrumentPane
             BeanUtils.copyProperties(config, vo);
             if (ObjectUtils.isNotEmpty(vo)) {
                 try {
-                    vo.setConfigDetails(URLDecoder.decode(vo.getConfigDetails(), StandardCharsets.UTF_8.name()));
+                    String configDetails = vo.getConfigDetails();
+                    if (StringUtils.isNotBlank(configDetails)){
+                        vo.setConfigDetails(URLDecoder.decode(configDetails, StandardCharsets.UTF_8.name()));
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                     throw new SysException("仪表板配置详情解密异常");