Commits · 132a36a2ae4422d0911bbcf14c7486382dbd76a0 · fulixin / dsk-operate-sys-cscec

21 Nov, 2023 18 commits
- 修改 · 132a36a2
  danfuman authored Nov 21, 2023
  
  132a36a2
- 修改 · d1d9c6aa
  danfuman authored Nov 21, 2023
  
  d1d9c6aa
- Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915 · 995827b9
  danfuman authored Nov 21, 2023
  
  995827b9
- 修改 · a59d087b
  danfuman authored Nov 21, 2023
  
  a59d087b
- 角色管理-分配用户:取消授权、添加用户操作(含批量)不会退出登录 · 8c8af47c
  施翔轲 authored Nov 21, 2023
  
  8c8af47c
- Merge branch 'V20230915' of 192.168.60.201:root/dsk-operate-sys into V20230915 · f8f0b5ad
  liuChang authored Nov 21, 2023
  
  f8f0b5ad
- 导出 · 97a38414
  liuChang authored Nov 21, 2023
  
  97a38414
- 修改 · 4fa07649
  danfuman authored Nov 21, 2023
  
  4fa07649
- 修改 · d1eaf91d
  danfuman authored Nov 21, 2023
  
  d1eaf91d
- Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915 · 3d39fde0
  danfuman authored Nov 21, 2023
  
  3d39fde0
- 修改 · 5fe81fd5
  danfuman authored Nov 21, 2023
  
  5fe81fd5
- 修改查询部门列表逻辑,保证新增用户、查所有部门时状态均正确 · a0be4624
  施翔轲 authored Nov 21, 2023
  
  a0be4624
- Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915 · 51bf9f96
  tianhongyang authored Nov 21, 2023
  
  51bf9f96
- 首页下拉处理错位更正 · d58cb9a5
  tianhongyang authored Nov 21, 2023
  
  d58cb9a5
- u · d17ead35
  lcl authored Nov 21, 2023
  
  d17ead35
- Merge remote-tracking branch 'origin/V20230915' into V20230915 · 0c05cc9e
  tanyang authored Nov 21, 2023
  
  0c05cc9e
- 修改开放平台测试地址 · 3b54e708
  tanyang authored Nov 21, 2023
  
  3b54e708
- 修改 · 8ad312d6
  danfuman authored Nov 21, 2023
  
  8ad312d6
20 Nov, 2023 9 commits
- 导出优化 · 4924e2fb
  liuChang authored Nov 20, 2023
  
  4924e2fb
- 导出优化 · 980f130f
  liuChang authored Nov 20, 2023
  
  980f130f
- 导出优化 · 0e7d902d
  liuChang authored Nov 20, 2023
  
  0e7d902d
- Merge branch 'V20230915' of 192.168.60.201:root/dsk-operate-sys into V20230915 · cc7dd8de
  liuChang authored Nov 20, 2023
  
  cc7dd8de
- 导出 · 9cb4e776
  liuChang authored Nov 20, 2023
  
  9cb4e776
- 补充丢失代码 · 8e4ccc6b
  tanyang authored Nov 20, 2023
  
  8e4ccc6b
- merge · b10ed2b2
  tianhongyang authored Nov 20, 2023
  
  b10ed2b2
- Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915 · a1b02ca2
  tianhongyang authored Nov 20, 2023
  
  a1b02ca2
- fix bug · caac205d
  tianhongyang authored Nov 20, 2023
  
  caac205d
17 Nov, 2023 4 commits
- Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915 · d7711d96
  danfuman authored Nov 17, 2023
```
# Conflicts:
#	dsk-operate-ui/src/assets/styles/public.scss
#	dsk-operate-ui/src/views/macro/urban/index.vue
```
  d7711d96
- 修改 · b9203304
  danfuman authored Nov 17, 2023
  
  b9203304
- Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915 · 0ef1f2fc
  tianhongyang authored Nov 17, 2023
  
  0ef1f2fc
- iframe子系统传参添加是否为外部链接 · 43aa5bbe
  tianhongyang authored Nov 17, 2023
  
  43aa5bbe
16 Nov, 2023 9 commits
- Merge branch 'master' into V20230915 · 4cbecf10
  tanyang authored Nov 16, 2023
```
# Conflicts:
#	dsk-operate-ui/.env.production
#	dsk-operate-ui/src/views/custom/customList/index.vue
#	pom.xml
```
  4cbecf10
- 集成goview 大屏设计系统 · 14dd60c8
  tanyang authored Nov 16, 2023
  
  14dd60c8
- 集成goview 大屏设计系统 · dbe4940a
  tanyang authored Nov 16, 2023
  
  dbe4940a
- 修复批量新增企业普通管理员账号手机号重复问题 · 2a473681
  施翔轲 authored Nov 16, 2023
  
  2a473681
- fix bug · 22d5962b
  tianhongyang authored Nov 16, 2023
  
  22d5962b
- fix bug · 2faa230e
  tianhongyang authored Nov 16, 2023
  
  2faa230e
- Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915 · 784433ae
  tianhongyang authored Nov 16, 2023
  
  784433ae
- 企业管理新添账号前端增加验证规则 · a11f3d06
  tianhongyang authored Nov 16, 2023
```
修复框架自带角色管理模块数据权限取值错误bug
```
  a11f3d06
- 修复登录 · e1e1ddf7
  施翔轲 authored Nov 16, 2023
  
  e1e1ddf7