Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git

fengxiang

2017-11-13 999d8a80d9a1c1f20033c29e7e2a08951766bee8

 src/main/resources/mapper/ApiDao.xml

@@ -9,7 +9,8 @@
    </select>



    <update id="updateFromequipmentBymac">

          UPDATE equipment set `name`=#{0} , address=#{1} ,  longitude=#{2}, latitude=#{3} ,repairman=#{4}   WHERE mac=#{5}

          UPDATE equipment set `name`=#{0} , address=#{1} ,  longitude=#{2}, latitude=#{3} ,repairman=#{4}   
          WHERE mac=#{5}

    </update>



     <insert id="insertIntoequipment">