Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserActiveLogMapper.xml

@@ -30,6 +30,15 @@
      <include refid="Base_Column_List" />
      from yeshi_ec_log_user_active where lua_uid = #{0} order by lua_id desc limit 1
   </select>
	
   <select id="selectFirstActiveInfo" resultMap="BaseResultMap"
      parameterType="java.lang.Long">
      select
      <include refid="Base_Column_List" />
      from yeshi_ec_log_user_active where lua_uid = #{0} order by lua_id  limit 1
   </select>
	
	

   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
      yeshi_ec_log_user_active where lua_id = #{id,jdbcType=BIGINT}