Merge remote-tracking branch 'origin/master'

admin

2019-04-12 2406574c36a8c4e8e8ffe7c56a34e25dde107a84

 fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/SpecialCardMapper.xml

@@ -67,7 +67,7 @@
         <if test='key != null and key != ""'>
               AND cd_name like '%${key}%'
         </if>
         ORDER BY cd_state DESC,cd_createtime
         ORDER BY cd_place_id,cd_state DESC
       LIMIT ${start},${count}
   </select>