Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/mapping/goods/SuperHotSearchMapper.xml

@@ -42,7 +42,7 @@
  <select id="listBySystemId" resultMap="BaseResultMap">
        SELECT * FROM yeshi_ec_super_hot_search sp 
        LEFT JOIN yeshi_ec_hot_search hc ON sp.`hotSearch_id` = hc.`id`
        WHERE sp.`system_id` =  #{systemId}
        WHERE sp.`system_id` =  #{systemId} <if test="useType != null"> AND hc.use_type = #{useType} </if>
        ORDER BY hc.`orderby` DESC
  </select>