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/ParentPlatformMapper.java

@@ -45,7 +45,6 @@
    @Delete("DELETE FROM parent_platform WHERE deviceGBId=#{deviceGBId}")
    int delParentPlatform(ParentPlatform parentPlatform);


    @Select("SELECT * FROM parent_platform")
    List<ParentPlatform> getParentPlatformList();