资讯与用户添加用户名称字段

wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml

@@ -6,6 +6,8 @@
         <result column="zxUrl" property="zxUrl"/>
         <result column="zxLikes" property="zxLikes"/>
         <result column="userid" property="userid"/>
+        <result column="userName" property="userName"/>
+        <result column="invite_code" property="inviteCode"/>
         <result column="zxName" property="zxName"/>
         <result column="zxShenHe" property="zxShenHe"/>
         <result column="zxField" property="zxField"/>
@@ -22,11 +24,11 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        zxUrl,userId,zxName,zxField,imgUrl,zxAddress
+        zxUrl,userId,zxName,zxField,imgUrl,zxAddress,inviteCode,userName
     </sql>
 
     <sql id="vals">
-        #{zxUrl},#{userId},#{zxName},#{zxField},#{imgUrl},#{zxAddress}
+        #{zxUrl},#{userId},#{zxName},#{zxField},#{imgUrl},#{zxAddress},#{inviteCode},#{userName}
     </sql>
     <!--资讯内容插入-->
     <insert id="zxadd" parameterType="cn.wisenergy.model.app.shopZx">
@@ -38,15 +40,6 @@
         )
     </insert>
 
-    <!--资讯内容插入-->
-    <!--<insert id="zxadd" parameterType="cn.wisenergy.model.app.shopZx" >-->
-      <!--INSERT INTO-->
-          <!--(zxUrl, userId,zxName,zxField,imgUrl)-->
-      <!--VALUES(-->
-         <!--#{zxUrl},#{userid},#{zxName},#{zxField},#{imgUrl}-->
-       <!--）-->
-    <!--</insert>-->
-
     <!--资讯内容倒叙查询-->
     <select id="findAll" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.app.shopZx">
     select zxid as zxid,zxUrl as zxUrl,

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -6,6 +6,7 @@
         <id column="id" property="id"/>
         <result column="user_id" property="userId"/>
         <result column="password" property="password"/>
+        <result column="userName" property="userName"/>
         <result column="head_image" property="headImage"/>
         <result column="user_level" property="userLevel"/>
         <result column="cross_border_line" property="crossBorderLine"/>
@@ -28,12 +29,12 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        user_id,password, head_image,user_level,cross_border_line,id_card_number,fans_nickname,fans_id, invite_code,
+        user_id,password,userName, head_image,user_level,cross_border_line,id_card_number,fans_nickname,fans_id, invite_code,
         be_invited_code,create_time,update_time
     </sql>
 
     <sql id="vals">
-        #{userId},#{password},#{headImage},#{userLevel},#{crossBorderLine},#{idCardNumber},#{fansNickname},#{fansId},#{inviteCode},
+        #{userId},#{password},#{userName},#{headImage},#{userLevel},#{crossBorderLine},#{idCardNumber},#{fansNickname},#{fansId},#{inviteCode},
         #{beInvitedCode},now(),now()
     </sql>
 
@@ -237,6 +238,7 @@
         select id as id,
         user_id as userId,
         password as password,
+        userName as userName,
         user_level as userLevel,
         cross_border_line as crossBorderLine,
         id_card_number as idCardNumber,

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

@@ -28,6 +28,12 @@ public class User extends Model<User> implements Serializable{
     @ApiModelProperty(name = "id", value = "用户主键id")
     private Integer id;
 
+    /**
+     * 用户名称
+     */
+    @ApiModelProperty(name = "userName", value = "用户名称")
+    private Integer userName;
+
     /**
      * 手机号作为用户账号
      */

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

@@ -44,6 +44,11 @@ public class UsersDto extends User implements Serializable {
      */
     private String beInvitedCode;
 
+    /**
+     * 用户名称
+     */
+    private Integer userName;
+
     /**
      * 创建时间
      */

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigInteger;
 import java.util.Date;
 import java.util.List;
 
@@ -42,6 +43,17 @@ public class shopZx extends Model<shopZx> implements Serializable {
     @ApiModelProperty(name = "userid", value = "用户id(作者id)")
     private String userid;
 
+    /**
+     * 用户名称
+     */
+    @ApiModelProperty(name = "userName", value = "用户id(作者id)")
+    private String userName;
+
+    /**
+     * 用户本人邀请码
+     */
+    @ApiModelProperty(name = "invite_code", value = "用户本人邀请码")
+    private String inviteCode;
     /**
      * 获赞数
      */
@@ -70,7 +82,7 @@ public class shopZx extends Model<shopZx> implements Serializable {
      * 资讯数据创建时间
      */
     @ApiModelProperty(name = "zxDate", value = "资讯数据创建时间")
-    private Date zxDate;
+    private BigInteger zxDate;
 
     /**
      * 图片存放地址imgUrl,zxAddress,zxField,zxName,userid,zxUrl