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

panlinlin

2021-01-12 6e4a8cac04432f5a36d5c5e3c5eb3d28d2295a5c

 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);

}