Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-17 9e248232763446e3b0d2b0541ee55e61a9df74b8

 src/main/resources/mapper/DeviceMapper.xml

@@ -288,6 +288,9 @@
               <if test="areaCode != null">
               AND mp.area_code = #{areaCode}
               </if>
               <if test="monitorPointId != null">
               AND mp.id = #{monitorPointId}
               </if>
         )
         <if test="professionId != null">
         AND d.profession_id = #{professionId}