06bfe3335e
# Conflicts: # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleUpdateStatusReqVO.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java |
||
---|---|---|
.. | ||
yudao-common | ||
yudao-spring-boot-starter-biz-data-permission | ||
yudao-spring-boot-starter-biz-ip | ||
yudao-spring-boot-starter-biz-tenant | ||
yudao-spring-boot-starter-env | ||
yudao-spring-boot-starter-excel | ||
yudao-spring-boot-starter-job | ||
yudao-spring-boot-starter-monitor | ||
yudao-spring-boot-starter-mq | ||
yudao-spring-boot-starter-mybatis | ||
yudao-spring-boot-starter-protection | ||
yudao-spring-boot-starter-redis | ||
yudao-spring-boot-starter-rpc | ||
yudao-spring-boot-starter-security | ||
yudao-spring-boot-starter-test | ||
yudao-spring-boot-starter-web | ||
yudao-spring-boot-starter-websocket | ||
pom.xml |