Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

panlinlin

2021-01-12 b6137471535fc88ba3b2a9e8beec9bb01850f4b3

 src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java

@@ -44,7 +44,6 @@
            ")")
    int add(Device device);


    @Update(value = {" <script>" +
                "UPDATE device " +
                "SET deviceId='${deviceId}'" +
@@ -67,5 +66,4 @@

    @Delete("DELETE FROM device WHERE deviceId=#{deviceId}")
    int del(String deviceId);

}