Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/mapping/push/DeviceActiveMapper.xml

@@ -39,6 +39,14 @@
      from yeshi_ec_device_active where da_device_token_md5 =
      #{deviceTokenMd5} and da_platform=#{platform}
   </select>
	
	
   <select id="selectFirst" resultMap="BaseResultMap" parameterType="java.lang.String">
      select
      <include refid="Base_Column_List" />
      from yeshi_ec_device_active where da_device =
      #{0} order by da_id limit 1
   </select>

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