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

src/main/java/com/syc/slm/slmbi/dto/InstrumentPanelConfigDTO.java

@@ -22,9 +22,6 @@ public class InstrumentPanelConfigDTO {
     @ApiModelProperty(value = "仪表板名称", required = true)
     private String panelName;
 
-    @ApiModelProperty(value = "仪表板分组id", required = true)
-    private String groupId;
-
     @ApiModelProperty(value = "仪表板配置详情，包含了样式，数据配置", required = true)
     private String configDetails;
 

src/main/java/com/syc/slm/slmbi/dto/InstrumentPanelPermissionDTO.java

@@ -24,6 +24,9 @@ public class InstrumentPanelPermissionDTO {
     @ApiModelProperty(value = "访问权限类型", required = true)
     private AccessType type;
 
+    @ApiModelProperty(value = "描述")
+    private String description;
+
     @ApiModelProperty(value = "自定义权限配置，当访问类型为CUSTOM时必填")
     private List<CustomPermissionDTO> customPermissions;