Commit f7a59b60 authored by licc's avatar licc

Merge remote-tracking branch 'origin/master'

parents 221616bf ef8e995a
...@@ -31,13 +31,13 @@ public class shopZx extends Model<shopZx> implements Serializable{ ...@@ -31,13 +31,13 @@ public class shopZx extends Model<shopZx> implements Serializable{
* 视频/图片存放地址 * 视频/图片存放地址
*/ */
@ApiModelProperty(name = "zxUrl", value = "视频/图片存放地址") @ApiModelProperty(name = "zxUrl", value = "视频/图片存放地址")
private Integer zxUrl; private String zxUrl;
/** /**
* 用户id(作者id * 用户id(作者id
*/ */
@ApiModelProperty(name = "userid", value = "用户id(作者id)") @ApiModelProperty(name = "userid", value = "用户id(作者id)")
private Integer userid; private String userid;
/** /**
* 获赞数 * 获赞数
...@@ -49,7 +49,7 @@ public class shopZx extends Model<shopZx> implements Serializable{ ...@@ -49,7 +49,7 @@ public class shopZx extends Model<shopZx> implements Serializable{
* 视频/图片名称 * 视频/图片名称
*/ */
@ApiModelProperty(name = "zxName", value = "视频/图片名称") @ApiModelProperty(name = "zxName", value = "视频/图片名称")
private Integer zxName; private String zxName;
/** /**
* 审核字段 * 审核字段
...@@ -61,7 +61,21 @@ public class shopZx extends Model<shopZx> implements Serializable{ ...@@ -61,7 +61,21 @@ public class shopZx extends Model<shopZx> implements Serializable{
* 资讯文字输入字段 * 资讯文字输入字段
*/ */
@ApiModelProperty(name = "zxField", value = "资讯文字输入字段") @ApiModelProperty(name = "zxField", value = "资讯文字输入字段")
private Integer zxField; private String zxField;
/**
* 资讯文字输入字段
*/
@ApiModelProperty(name = "zxField", value = "资讯数据创建时间")
private Data zxDate;
public Data getZxDate() {
return zxDate;
}
public void setZxDate(Data zxDate) {
this.zxDate = zxDate;
}
public Integer getZxid() { public Integer getZxid() {
return zxid; return zxid;
...@@ -71,19 +85,19 @@ public class shopZx extends Model<shopZx> implements Serializable{ ...@@ -71,19 +85,19 @@ public class shopZx extends Model<shopZx> implements Serializable{
this.zxid = zxid; this.zxid = zxid;
} }
public Integer getZxUrl() { public String getZxUrl() {
return zxUrl; return zxUrl;
} }
public void setZxUrl(Integer zxUrl) { public void setZxUrl(String zxUrl) {
this.zxUrl = zxUrl; this.zxUrl = zxUrl;
} }
public Integer getUserid() { public String getUserid() {
return userid; return userid;
} }
public void setUserid(Integer userid) { public void setUserid(String userid) {
this.userid = userid; this.userid = userid;
} }
...@@ -95,11 +109,11 @@ public class shopZx extends Model<shopZx> implements Serializable{ ...@@ -95,11 +109,11 @@ public class shopZx extends Model<shopZx> implements Serializable{
this.zxLikes = zxLikes; this.zxLikes = zxLikes;
} }
public Integer getZxName() { public String getZxName() {
return zxName; return zxName;
} }
public void setZxName(Integer zxName) { public void setZxName(String zxName) {
this.zxName = zxName; this.zxName = zxName;
} }
...@@ -111,13 +125,14 @@ public class shopZx extends Model<shopZx> implements Serializable{ ...@@ -111,13 +125,14 @@ public class shopZx extends Model<shopZx> implements Serializable{
this.zxShenHe = zxShenHe; this.zxShenHe = zxShenHe;
} }
public Integer getZxField() { public String getZxField() {
return zxField; return zxField;
} }
public void setZxField(Integer zxField) { public void setZxField(String zxField) {
this.zxField = zxField; this.zxField = zxField;
} }
@Override @Override
public String toString() { public String toString() {
return "shopzx{" + return "shopzx{" +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment