fanli-server.git

			@@ -21,14 +21,7 @@

			private static final long serialVersionUID = 1L;

			// 圆形
			public static String SHOWTYPE_ARC = "arc";
			// 方块
			public static String SHOWTYPE_BLOCK = "block";
			// 活动
			public static String SHOWTYPE_ACTIVITY = "activity";


			@Expose
			@Column(name = "b_id")
			private Long id;

			@@ -46,11 +39,15 @@
			@Column(name = "b_card_id")
			private Long cardId;


			// 主图
			@Expose
			@Column(name = "b_main_picture")
			private String picture;

			// 装饰图
			@Expose
			@Column(name = "b_icon")
			private String icon;

			// 附图
			@Expose
			@@ -67,6 +64,10 @@
			@Column(name = "b_params")
			private String params;

			// 跳转是否需要登录
			@Column(name = "b_jump_login")
			private boolean jumpLogin;

			// 排序
			@Column(name = "b_orderby")
			private Integer orderby;
			@@ -92,6 +93,13 @@
			@Column(name = "b_updatetime")
			private Date updatetime;

			// 背景图片
			private String bottomPicture;

			// 是否删除图片
			private Boolean delIcon;
			private Boolean delPicture;
			private Boolean delSubPicture;

			public Long getId() {
			return id;
			@@ -206,4 +214,52 @@
			this.remark = remark;
			}

			public boolean isJumpLogin() {
			return jumpLogin;
			}

			public void setJumpLogin(boolean jumpLogin) {
			this.jumpLogin = jumpLogin;
			}

			public String getBottomPicture() {
			return bottomPicture;
			}

			public void setBottomPicture(String bottomPicture) {
			this.bottomPicture = bottomPicture;
			}

			public String getIcon() {
			return icon;
			}

			public void setIcon(String icon) {
			this.icon = icon;
			}

			public Boolean getDelIcon() {
			return delIcon;
			}

			public void setDelIcon(Boolean delIcon) {
			this.delIcon = delIcon;
			}

			public Boolean getDelPicture() {
			return delPicture;
			}

			public void setDelPicture(Boolean delPicture) {
			this.delPicture = delPicture;
			}

			public Boolean getDelSubPicture() {
			return delSubPicture;
			}

			public void setDelSubPicture(Boolean delSubPicture) {
			this.delSubPicture = delSubPicture;
			}

			}