 james
|
3b9017c0c3
Merge branch 'system-zyj' into system-165
|
4 napja |
|
james
|
3a4762ad9e
优化新增保存平台账户信息接口，当为租户管理员时，增加顶级部门的默认代入
|
4 napja |
|
james
|
28a14cf93b
Merge branch 'system-zyj' into system-165
|
6 napja |
|
james
|
738e61cc1b
优化租户管理-租户单位配置-克隆接口，增加循环处理克隆当前租户当前用户对应的多个用户角色和租户用户角色的逻辑
|
6 napja |
|
james
|
a8837338bd
Merge branch 'system-zyj' into system-165
|
6 napja |
|
james
|
1166b34f0f
1、优化租户管理-租户单位配置-克隆接口，增加循环处理多个用户角色和租户用户角色的逻辑；
|
6 napja |
 fuyuchuan
|
db4f9d6cb6
Merge branch 'fu-dev' of uskycloud/usky-cloud into system-165
|
1 hete |
|
fuyuchuan
|
27f6ca2b97
Merge branch 'system-165' into fu-dev
|
1 hete |
|
fuyuchuan
|
7701adca8b
Merge branch 'master' of http://47.111.81.118:3000/uskycloud/usky-cloud into system-165
|
1 hete |
|
fuyuchuan
|
d96fbbddcb
小铃铛添加消息大类字段返回
|
1 hete |
|
james
|
66618d223d
Merge branch 'system-zyj' into system-165
|
1 hete |
|
james
|
36c0f53f77
优化租户管理-新增接口，将PC租户管理-应用编辑接口新增租户与默认应用添加到租户和应用关联表逻辑迁移过来1
|
1 hete |
|
james
|
58f359f88a
Merge branch 'system-zyj' into system-165
|
1 hete |
|
james
|
2cc09cb8d6
优化租户管理-新增接口，将PC租户管理-应用编辑接口新增租户与默认应用添加到租户和应用关联表逻辑迁移过来
|
1 hete |
|
fuyuchuan
|
52f5ccceb2
Merge branch 'master' of http://47.111.81.118:3000/uskycloud/usky-cloud into fu-dev
|
1 hete |
|
fuyuchuan
|
498a80478f
Merge branch 'fu-dev' of uskycloud/usky-cloud into system-165
|
1 hete |
|
fuyuchuan
|
89bc586bd0
消息中心修复租户隔离、消息分类大类
|
1 hete |
 gez
|
926edd7563
Merge branch 'fu-dev' of uskycloud/usky-cloud into master
|
1 hete |
|
gez
|
6646e463d9
Merge branch 'system-zyj' of uskycloud/usky-cloud into master
|
1 hete |
|
fuyuchuan
|
5941f5ffcc
Merge branch 'fu-dev' of uskycloud/usky-cloud into system-165
|
2 hete |
|
fuyuchuan
|
4b35df00a3
Merge branch 'system-165' into fu-dev
|
2 hete |
|
fuyuchuan
|
3874765a81
修复切换租户后分配角色后菜单接口数据异常问题
|
2 hete |
|
fuyuchuan
|
0132a9aa0f
Merge branch 'master' of http://47.111.81.118:3000/uskycloud/usky-cloud into fu-dev
|
2 hete |
 hanzhengyi
|
5064a80aed
Merge branch 'han' of uskycloud/usky-cloud into system-165
|
2 hete |
|
hanzhengyi
|
bd53c4f363
解决冲突
|
2 hete |
|
hanzhengyi
|
868377a9de
应用管理增加排序字段，应用菜单增加排序返回值
|
3 hete |
|
james
|
536d39b517
Merge branch 'system-zyj' into system-165
|
3 hete |
|
james
|
5a959c53c0
与界面对接，修改系统角色表createtime字段
|
3 hete |
|
james
|
390b0ad0a0
Merge branch 'system-zyj' into system-165
|
3 hete |
|
james
|
e4cea614cc
优化租户管理-租户单位配置-克隆和租户管理-租户单位配置-删除两个接口，增加和删除角色表中该租户的角色信息和用户角色租户表中对应当前用户Id租户Id对应信息
|
3 hete |
