Merge branch 'wvp-28181-2.0' into wvp-28181-2.0

mrjackwang

2022-03-15 42901d03746d534d701ea3b8663e1c6d2c938c6d

 src/test/java/com/genersoft/iot/vmp/service/impl/RoleServiceImplTest.java

@@ -25,7 +25,6 @@
    void getAllUser() {
        List<Role> all = roleService.getAll();
        Role roleById = roleService.getRoleById(1);
        System.out.println();

    }