合并分支 'gwj' 到 'master'

notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/RoleServiceImpl.java

@@ -129,6 +129,7 @@ public class RoleServiceImpl implements IRoleService {
         if(byId.isPresent()){
             Role role1 = byId.get();
             role1.setName(role.getName());
+            role1.setIsPlus(role.getIsPlus());
             role1.setDescription(role.getDescription());
             roleDao.save(role1);
             roleAuthorityDao.deleteAllByRoleId(role1.getId());