Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-auth into developer

# Conflicts:
#	gic-platform-auth-service/src/main/resources/mapper/TabSysAuthCodeMapper.xml

gic-platform-auth-service/src/main/resources/mapper/TabSysAuthCodeMapper.xml

@@ -25,7 +25,6 @@
     delete from tab_sys_auth_code
     where auth_code_id = #{authCodeId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.gic.auth.entity.TabSysAuthCode" useGeneratedKeys="true" keyProperty="authCodeId">
   <insert id="insert" parameterType="com.gic.auth.entity.TabSysAuthCode">
     <selectKey keyProperty="authCodeId" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()