Merge remote-tracking branch 'origin/master'

沈斌

2017-11-11 45be44fb95325305373647231ef74e72d1501f8c

 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">