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

panlinlin

2021-01-12 700398ba1359e75c766e5116b4b1d0f962b5fdf9

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

@@ -66,5 +66,4 @@

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

}