Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

 src/main/resources/mapper/HistoryMapper.xml

@@ -115,4 +115,17 @@
         AND mp.${regionType}_code = #{regionCode}

         AND dis.`year` = #{year}

   </select>

	
   <select id="getValueByMacAndSize" resultType="java.util.Map">

      SELECT 
         value,

         time

      FROM

         history 
      WHERE

         mac = #{mac} 
      ORDER BY

         time DESC 
      LIMIT #{size}

   </select>

</mapper>