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

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

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

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

@@ -77,7 +77,7 @@ public class OperMenuDTO extends TreeNode<OperMenuDTO> implements Serializable {
 	/**
 	 * 是否显示，1：显示 0不显示
 	 */
-	private String showFlag;
+	private Integer showFlag;
 
 	public void setName(String name) {
 		this.name = name;
@@ -160,11 +160,11 @@ public class OperMenuDTO extends TreeNode<OperMenuDTO> implements Serializable {
 		this.parentName = parentName;
 	}
 
-	public String getShowFlag() {
+	public Integer getShowFlag() {
 		return showFlag;
 	}
 
-	public void setShowFlag(String showFlag) {
+	public void setShowFlag(Integer showFlag) {
 		this.showFlag = showFlag;
 	}
 }

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

@@ -67,5 +67,5 @@ public class OperMenuEntity extends BaseEpmetEntity {
 	/**
 	 * 是否显示，1：显示 0不显示
 	 */
-	private String showFlag;
+	private Integer showFlag;
 }

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不显示';