Merge remote-tracking branch 'origin/master'

master
xxssyyyyssxx 2021-12-03 11:36:01 +08:00
commit a60c36ee48
1 changed files with 2 additions and 2 deletions

View File

@ -66,7 +66,7 @@ public class SysRoleController extends BaseController{
model.put("level",roleLevels);//默认 省级 model.put("level",roleLevels);//默认 省级
model.put("type",roleTypes);//角色类型 model.put("type",roleTypes);//角色类型
model.put("role",role); model.put("role",role);
model.put("selectedType",roleLevels.get(0).getValue()); //model.put("selectedType",roleLevels.get(0).getValue());
return "/admin/role_input"; return "/admin/role_input";
} }
@ -84,7 +84,7 @@ public class SysRoleController extends BaseController{
model.put("roleName",role.getName()); model.put("roleName",role.getName());
model.put("level",roleLevels); model.put("level",roleLevels);
model.put("type",roleTypes); model.put("type",roleTypes);
model.put("selectedType",role.getType()); //model.put("selectedType",role.getType());
model.put("role",role); model.put("role",role);
return "admin/role_input"; return "admin/role_input";
} }