Merge branch 'fix/门户页面v2缺少description字段' into 'wrdp'

【门户】门户页面v2缺少description字段

See merge request o2oa/o2oa!2159

o2server/x_portal_assemble_surface/src/main/java/com/x/portal/assemble/surface/jaxrs/page/BaseAction.java

@@ -74,6 +74,7 @@ abstract class BaseAction extends StandardJaxrsAction {
 			this.id = page.getId();
 			this.alias = page.getAlias();
 			this.name = page.getName();
+			this.description = page.getDescription();
 			this.portal = page.getPortal();
 			this.hasMobile = page.getHasMobile();
 			this.data = data;
@@ -82,6 +83,7 @@ abstract class BaseAction extends StandardJaxrsAction {
 		private String id;
 		private String alias;
 		private String name;
+		private String description;
 		private String portal;
 		private Boolean hasMobile;
 		private String data;
@@ -133,6 +135,14 @@ abstract class BaseAction extends StandardJaxrsAction {
 		public void setData(String data) {
 			this.data = data;
 		}
+
+		public String getDescription() {
+			return description;
+		}
+
+		public void setDescription(String description) {
+			this.description = description;
+		}
 	}
 
 	public static class RelatedWidget extends GsonPropertyObject {