From 59bfbce44674e52aefbe883233ffaea93d750a8f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 09:56:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserRankMapper.xml |  132 ++++++++++++++++++++++----------------------
 1 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserRankMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserRankMapper.xml
index cfb4903..4f3a627 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserRankMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserRankMapper.xml
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.yeshi.fanli.dao.mybatis.user.UserRankMapper">
-  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.UserRank">
-    <id column="ur_id" property="id" jdbcType="BIGINT"/>
-    <result column="ur_name" property="name" jdbcType="VARCHAR"/>
-    <result column="ur_picture" property="picture" jdbcType="VARCHAR"/>
-    <result column="ur_icon" property="icon" jdbcType="VARCHAR"/>
-    <result column="ur_rebate_num" property="rebateNum" jdbcType="INTEGER"/>
-    <result column="ur_share_num" property="shareNum" jdbcType="INTEGER"/>
-    <result column="ur_invite_num" property="inviteNum" jdbcType="INTEGER"/>
-    <result column="ur_orderby" property="orderby" jdbcType="INTEGER"/>
-    <result column="ur_create_time" property="createTime" jdbcType="TIMESTAMP"/>
-    <result column="ur_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
-  </resultMap>
-  <sql id="Base_Column_List">ur_id,ur_name,ur_picture,ur_icon,ur_rebate_num,ur_share_num,ur_invite_num,ur_orderby,ur_create_time,ur_update_time</sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
-    <include refid="Base_Column_List"/>from yeshi_ec_user_rank where ur_id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_user_rank where ur_id = #{id,jdbcType=BIGINT}</delete>
-  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserRank" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_rank (ur_id,ur_name,ur_picture,ur_icon,ur_rebate_num,ur_share_num,ur_invite_num,ur_orderby,ur_create_time,ur_update_time) values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{picture,jdbcType=VARCHAR},#{icon,jdbcType=VARCHAR},#{rebateNum,jdbcType=INTEGER},#{shareNum,jdbcType=INTEGER},#{inviteNum,jdbcType=INTEGER},#{orderby,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>
-  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserRank" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_rank
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">ur_id,</if>
-      <if test="name != null">ur_name,</if>
-      <if test="picture != null">ur_picture,</if>
-      <if test="icon != null">ur_icon,</if>
-      <if test="rebateNum != null">ur_rebate_num,</if>
-      <if test="shareNum != null">ur_share_num,</if>
-      <if test="inviteNum != null">ur_invite_num,</if>
-      <if test="orderby != null">ur_orderby,</if>
-      <if test="createTime != null">ur_create_time,</if>
-      <if test="updateTime != null">ur_update_time,</if>
-    </trim>values
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">#{id,jdbcType=BIGINT},</if>
-      <if test="name != null">#{name,jdbcType=VARCHAR},</if>
-      <if test="picture != null">#{picture,jdbcType=VARCHAR},</if>
-      <if test="icon != null">#{icon,jdbcType=VARCHAR},</if>
-      <if test="rebateNum != null">#{rebateNum,jdbcType=INTEGER},</if>
-      <if test="shareNum != null">#{shareNum,jdbcType=INTEGER},</if>
-      <if test="inviteNum != null">#{inviteNum,jdbcType=INTEGER},</if>
-      <if test="orderby != null">#{orderby,jdbcType=INTEGER},</if>
-      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-      <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserRank">update yeshi_ec_user_rank set ur_name = #{name,jdbcType=VARCHAR},ur_picture = #{picture,jdbcType=VARCHAR},ur_icon = #{icon,jdbcType=VARCHAR},ur_rebate_num = #{rebateNum,jdbcType=INTEGER},ur_share_num = #{shareNum,jdbcType=INTEGER},ur_invite_num = #{inviteNum,jdbcType=INTEGER},ur_orderby = #{orderby,jdbcType=INTEGER},ur_create_time = #{createTime,jdbcType=TIMESTAMP},ur_update_time = #{updateTime,jdbcType=TIMESTAMP} where ur_id = #{id,jdbcType=BIGINT}</update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserRank">update yeshi_ec_user_rank
-    <set>
-      <if test="name != null">ur_name=#{name,jdbcType=VARCHAR},</if>
-      <if test="picture != null">ur_picture=#{picture,jdbcType=VARCHAR},</if>
-      <if test="icon != null">ur_icon=#{icon,jdbcType=VARCHAR},</if>
-      <if test="rebateNum != null">ur_rebate_num=#{rebateNum,jdbcType=INTEGER},</if>
-      <if test="shareNum != null">ur_share_num=#{shareNum,jdbcType=INTEGER},</if>
-      <if test="inviteNum != null">ur_invite_num=#{inviteNum,jdbcType=INTEGER},</if>
-      <if test="orderby != null">ur_orderby=#{orderby,jdbcType=INTEGER},</if>
-      <if test="createTime != null">ur_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
-      <if test="updateTime != null">ur_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
-    </set> where ur_id = #{id,jdbcType=BIGINT}
-  </update>
-  <select id="getAllRank" resultMap="BaseResultMap">
-  	select <include refid="Base_Column_List"/>from yeshi_ec_user_rank ORDER BY ur_orderby
-  </select>
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.yeshi.fanli.dao.mybatis.user.UserRankMapper">
+  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.UserRank">
+    <id column="ur_id" property="id" jdbcType="BIGINT"/>
+    <result column="ur_name" property="name" jdbcType="VARCHAR"/>
+    <result column="ur_picture" property="picture" jdbcType="VARCHAR"/>
+    <result column="ur_icon" property="icon" jdbcType="VARCHAR"/>
+    <result column="ur_rebate_num" property="rebateNum" jdbcType="INTEGER"/>
+    <result column="ur_share_num" property="shareNum" jdbcType="INTEGER"/>
+    <result column="ur_invite_num" property="inviteNum" jdbcType="INTEGER"/>
+    <result column="ur_orderby" property="orderby" jdbcType="INTEGER"/>
+    <result column="ur_create_time" property="createTime" jdbcType="TIMESTAMP"/>
+    <result column="ur_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+  </resultMap>
+  <sql id="Base_Column_List">ur_id,ur_name,ur_picture,ur_icon,ur_rebate_num,ur_share_num,ur_invite_num,ur_orderby,ur_create_time,ur_update_time</sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
+    <include refid="Base_Column_List"/>from yeshi_ec_user_rank where ur_id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_user_rank where ur_id = #{id,jdbcType=BIGINT}</delete>
+  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserRank" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_rank (ur_id,ur_name,ur_picture,ur_icon,ur_rebate_num,ur_share_num,ur_invite_num,ur_orderby,ur_create_time,ur_update_time) values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{picture,jdbcType=VARCHAR},#{icon,jdbcType=VARCHAR},#{rebateNum,jdbcType=INTEGER},#{shareNum,jdbcType=INTEGER},#{inviteNum,jdbcType=INTEGER},#{orderby,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>
+  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserRank" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_rank
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">ur_id,</if>
+      <if test="name != null">ur_name,</if>
+      <if test="picture != null">ur_picture,</if>
+      <if test="icon != null">ur_icon,</if>
+      <if test="rebateNum != null">ur_rebate_num,</if>
+      <if test="shareNum != null">ur_share_num,</if>
+      <if test="inviteNum != null">ur_invite_num,</if>
+      <if test="orderby != null">ur_orderby,</if>
+      <if test="createTime != null">ur_create_time,</if>
+      <if test="updateTime != null">ur_update_time,</if>
+    </trim>values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">#{id,jdbcType=BIGINT},</if>
+      <if test="name != null">#{name,jdbcType=VARCHAR},</if>
+      <if test="picture != null">#{picture,jdbcType=VARCHAR},</if>
+      <if test="icon != null">#{icon,jdbcType=VARCHAR},</if>
+      <if test="rebateNum != null">#{rebateNum,jdbcType=INTEGER},</if>
+      <if test="shareNum != null">#{shareNum,jdbcType=INTEGER},</if>
+      <if test="inviteNum != null">#{inviteNum,jdbcType=INTEGER},</if>
+      <if test="orderby != null">#{orderby,jdbcType=INTEGER},</if>
+      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+      <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserRank">update yeshi_ec_user_rank set ur_name = #{name,jdbcType=VARCHAR},ur_picture = #{picture,jdbcType=VARCHAR},ur_icon = #{icon,jdbcType=VARCHAR},ur_rebate_num = #{rebateNum,jdbcType=INTEGER},ur_share_num = #{shareNum,jdbcType=INTEGER},ur_invite_num = #{inviteNum,jdbcType=INTEGER},ur_orderby = #{orderby,jdbcType=INTEGER},ur_create_time = #{createTime,jdbcType=TIMESTAMP},ur_update_time = #{updateTime,jdbcType=TIMESTAMP} where ur_id = #{id,jdbcType=BIGINT}</update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserRank">update yeshi_ec_user_rank
+    <set>
+      <if test="name != null">ur_name=#{name,jdbcType=VARCHAR},</if>
+      <if test="picture != null">ur_picture=#{picture,jdbcType=VARCHAR},</if>
+      <if test="icon != null">ur_icon=#{icon,jdbcType=VARCHAR},</if>
+      <if test="rebateNum != null">ur_rebate_num=#{rebateNum,jdbcType=INTEGER},</if>
+      <if test="shareNum != null">ur_share_num=#{shareNum,jdbcType=INTEGER},</if>
+      <if test="inviteNum != null">ur_invite_num=#{inviteNum,jdbcType=INTEGER},</if>
+      <if test="orderby != null">ur_orderby=#{orderby,jdbcType=INTEGER},</if>
+      <if test="createTime != null">ur_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+      <if test="updateTime != null">ur_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
+    </set> where ur_id = #{id,jdbcType=BIGINT}
+  </update>
+  <select id="getAllRank" resultMap="BaseResultMap">
+  	select <include refid="Base_Column_List"/>from yeshi_ec_user_rank ORDER BY ur_orderby
+  </select>
+</mapper>

--
Gitblit v1.8.0