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

panlinlin

2021-01-11 8b4d8a76acf3a699744caeda8ca6f0268136727e

 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}'" +