Merge remote-tracking branch 'origin/master'

sdjk-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -203,7 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null">remark = #{remark},</if>
 			<if test="agentType != null and agentType != ''">agent_type = #{agentType},</if>
 			<if test="agentRemainingNumber != null and agentRemainingNumber != ''">agent_remaining_number = #{agentRemainingNumber},</if>
-			<if test="agentExpireTime != null and agentExpireTime != ''">agent_expire_time = #{agentExpireTime},</if>
+			<if test="agentExpireTime != null ">agent_expire_time = #{agentExpireTime},</if>
 			<if test="referralCode != null and referralCode != ''">referral_code = #{referralCode},</if>
  			update_time = sysdate()
  		</set>