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

panlinlin

2021-01-08 7e581e9d3a0e32be5e90e453f4283d70d895a634

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