Merge remote-tracking branch 'origin/master'

wisenergy-model/src/main/java/cn/wisenergy/model/app/shopZx.java

@@ -31,13 +31,13 @@ public class shopZx extends Model<shopZx> implements Serializable{
      * 视频/图片存放地址
      */
     @ApiModelProperty(name = "zxUrl", value = "视频/图片存放地址")
-    private Integer zxUrl;
+    private String zxUrl;
 
     /**
      * 用户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{
      * 视频/图片名称
      */
     @ApiModelProperty(name = "zxName", value = "视频/图片名称")
-    private Integer zxName;
+    private String zxName;
 
     /**
      * 审核字段
@@ -61,7 +61,21 @@ public class shopZx extends Model<shopZx> implements Serializable{
      * 资讯文字输入字段
      */
     @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() {
         return zxid;
@@ -71,19 +85,19 @@ public class shopZx extends Model<shopZx> implements Serializable{
         this.zxid = zxid;
     }
 
-    public Integer getZxUrl() {
+    public String getZxUrl() {
         return zxUrl;
     }
 
-    public void setZxUrl(Integer zxUrl) {
+    public void setZxUrl(String zxUrl) {
         this.zxUrl = zxUrl;
     }
 
-    public Integer getUserid() {
+    public String getUserid() {
         return userid;
     }
 
-    public void setUserid(Integer userid) {
+    public void setUserid(String userid) {
         this.userid = userid;
     }
 
@@ -95,11 +109,11 @@ public class shopZx extends Model<shopZx> implements Serializable{
         this.zxLikes = zxLikes;
     }
 
-    public Integer getZxName() {
+    public String getZxName() {
         return zxName;
     }
 
-    public void setZxName(Integer zxName) {
+    public void setZxName(String zxName) {
         this.zxName = zxName;
     }
 
@@ -111,13 +125,14 @@ public class shopZx extends Model<shopZx> implements Serializable{
         this.zxShenHe = zxShenHe;
     }
 
-    public Integer getZxField() {
+    public String getZxField() {
         return zxField;
     }
 
-    public void setZxField(Integer zxField) {
+    public void setZxField(String zxField) {
         this.zxField = zxField;
     }
+
     @Override
     public String toString() {
         return "shopzx{" +