fanli-server.git

			@@ -13,7 +13,11 @@
			public final static int STATE_INIT = 0;
			public final static int STATE_SUCCESS = 1;
			public final static int STATE_FAIL = 2;


			public final static int TYPE_GOODS = 1;
			public final static int TYPE_ACTIVITY = 2;


			@Column(name = "pg_id")
			private Long id;

			@@ -65,9 +69,17 @@

			@Column(name = "pg_updatetime")
			private Date updateTime;

			// 是否定时
			private Boolean timeTask;

			// 类型
			@Column(name = "pg_type")
			private Integer type;
			// 其他参数
			@Column(name = "pg_other_id")
			private String otherId;
			// 浏览次数
			@Column(name = "pg_scan_num")
			private Integer scanNum;

			// 定时时间
			private String controlTime_str;

			@@ -83,8 +95,6 @@
			public PushGoods(Long id){
			this.id = id;
			}



			public Long getId() {
			return id;
			@@ -214,13 +224,6 @@
			this.controlTime = controlTime;
			}

			public Boolean isTimeTask() {
			return timeTask;
			}

			public void setTimeTask(Boolean timeTask) {
			this.timeTask = timeTask;
			}

			public String getControlTime_str() {
			return controlTime_str;
			@@ -237,5 +240,29 @@
			public void setRemark(String remark) {
			this.remark = remark;
			}

			public Integer getType() {
			return type;
			}

			public void setType(Integer type) {
			this.type = type;
			}

			public Integer getScanNum() {
			return scanNum;
			}

			public void setScanNum(Integer scanNum) {
			this.scanNum = scanNum;
			}

			public String getOtherId() {
			return otherId;
			}

			public void setOtherId(String otherId) {
			this.otherId = otherId;
			}

			}