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

lawrencehj

2021-03-14 03ec48e32c9122e1ab0c69ceb6fc56461c697c80

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

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


    @Update(value = {" <script>" +
                "UPDATE device " +
                "SET deviceId='${deviceId}'" +