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

epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/OperMenuDTO.java

@@ -117,4 +117,8 @@ public class OperMenuDTO extends TreeStringNode<OperMenuDTO> implements Serializ
 	 */
 	private String parentName;
 
+	/**
+	 * 是否显示，1：显示 0不显示
+	 */
+	private Integer showFlag;
 }

epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/dto/result/OperMenuDTO.java

@@ -74,6 +74,10 @@ public class OperMenuDTO extends TreeNode<OperMenuDTO> implements Serializable {
 
 	@ApiModelProperty(value = "上级菜单名称")
 	private String parentName;
+	/**
+	 * 是否显示，1：显示 0不显示
+	 */
+	private Integer showFlag;
 
 	public void setName(String name) {
 		this.name = name;
@@ -155,4 +159,12 @@ public class OperMenuDTO extends TreeNode<OperMenuDTO> implements Serializable {
 	public void setParentName(String parentName) {
 		this.parentName = parentName;
 	}
+
+	public Integer getShowFlag() {
+		return showFlag;
+	}
+
+	public void setShowFlag(Integer showFlag) {
+		this.showFlag = showFlag;
+	}
 }

epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/entity/OperMenuEntity.java

@@ -64,4 +64,8 @@ public class OperMenuEntity extends BaseEpmetEntity {
 	@TableField(exist = false)
 	private String parentName;
 
+	/**
+	 * 是否显示，1：显示 0不显示
+	 */
+	private Integer showFlag;
 }

epmet-module/oper-access/oper-access-server/src/main/resources/db/migration/V0.0.2__OperMenuAddShowFlag.sql

@@ -0,0 +1 @@
+alter table oper_menu add COLUMN   `SHOW_FLAG` varchar(1) NOT NULL DEFAULT '1' COMMENT '是否显示，1：显示 0不显示';

epmet-module/oper-access/oper-access-server/src/main/resources/db/migration/V0.0.3__OperMenuAddShowFlagV1.sql

@@ -0,0 +1 @@
+alter table oper_menu MODIFY COLUMN   `SHOW_FLAG` int(11) NOT NULL DEFAULT 1 COMMENT '是否显示，1：显示 0不显示';