Merge remote-tracking branch 'origin/master'

@@ -28,31 +28,4 @@
       </if>
       </if>
     </trim>
     </trim>
   </insert>
   </insert>
-  <resultMap id="BaseResultMap" type="com.sunyo.wlpt.base.model.CONFIG_USER_CUSTOMCODE">
-    <result column="userID" jdbcType="INTEGER" property="userid" />
-    <result column="customCode" jdbcType="VARCHAR" property="customcode" />
-  </resultMap>
-  <insert id="insert" parameterType="com.sunyo.wlpt.base.model.CONFIG_USER_CUSTOMCODE">
-    insert into CONFIG_USER_CUSTOMCODE (userID, customCode)
-    values (#{userid,jdbcType=INTEGER}, #{customcode,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.sunyo.wlpt.base.model.CONFIG_USER_CUSTOMCODE">
-    insert into CONFIG_USER_CUSTOMCODE
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="userid != null">
-        userID,
-      </if>
-      <if test="customcode != null">
-        customCode,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="userid != null">
-        #{userid,jdbcType=INTEGER},
-      </if>
-      <if test="customcode != null">
-        #{customcode,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
 </mapper>
 </mapper>