development-history/proxy.git

			@@ -45,7 +45,7 @@
			}

			// 主键
			private Integer id;
			private String id;
			// 编码
			private String sn;
			// 名称
			@@ -53,23 +53,23 @@
			// 类型
			private String type;
			// 排序
			private Integer orderBy;
			private String orderBy;
			// 父级id
			private Integer pid;
			private String pid;
			// 备注
			private String remark;

			/**
			* Get 主键
			*/
			public Integer getId() {
			public String getId() {
			return id;
			}

			/**
			* Set 主键
			*/
			public void setId(Integer id) {
			public void setId(String id) {
			this.id = id;
			}

			@@ -118,28 +118,28 @@
			/**
			* Get 排序
			*/
			public Integer getOrderBy() {
			public String getOrderBy() {
			return orderBy;
			}

			/**
			* Set 排序
			*/
			public void setOrderBy(Integer orderBy) {
			public void setOrderBy(String orderBy) {
			this.orderBy = orderBy;
			}

			/**
			* Get 父级id
			*/
			public Integer getPid() {
			public String getPid() {
			return pid;
			}

			/**
			* Set 父级id
			*/
			public void setPid(Integer pid) {
			public void setPid(String pid) {
			this.pid = pid;
			}