Merge remote-tracking branch 'origin/div' into div

admin

2019-09-20 db88b87df461820152d68d3d55a28f30c2da83e6

 fanli/src/main/java/com/yeshi/fanli/mapping/brand/BrandInfoRecordMapper.xml

@@ -86,4 +86,18 @@
       <if test="uid != null">AND bir_uid = #{uid}</if>
          <if test="device != null">AND bir_device = #{device}</if>
  </select>
  
  
   <select id="listValidByCidToApp" resultMap="BaseResultMap">
    SELECT * FROM 
        (SELECT bir_id FROM yeshi_ec_brand_info_record
      WHERE bir_state = 0 
         <if test="uid != null">AND bir_uid = #{uid}</if>
            <if test="device != null">AND bir_device = #{device}</if>
      GROUP BY bir_bid)A 
   LEFT JOIN yeshi_ec_brand_info_record h on  A.bir_id = h.bir_id
   LEFT JOIN `yeshi_ec_brand_info` p ON h.`bir_bid` = p.`bf_id`
   ORDER BY  h.bir_update_time DESC
   LIMIT ${start},${count}
  </select>
</mapper>