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

panlinlin

2021-01-11 d94135c9cd8b12fc511055af4398ad3a584a44d6

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