Commits · cf637611370d20d3c9b307d7032f8d94f2e30d5e · 融通安全管理系统 / rongtong-app

08 Jul, 2023 25 commits
- 合并冲突 · cf637611
  yf authored Jul 08, 2023
  
  cf637611
- 修改任务详情界面权限及审批流程对接 · 3e252c23
  yf authored Jul 08, 2023
  
  3e252c23
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into develop · e3ccc85d
  胡占生 authored Jul 08, 2023
  
  e3ccc85d
- Merge branch 'dev-yf'' into 'develop' · 3b9d0486
  杨帆 authored Jul 08, 2023
```
Dev yf'

See merge request !8
```
  3b9d0486
- Dev yf' · b7db97c9
  杨帆 authored Jul 08, 2023
  
  b7db97c9
- fix: bug 修复 · b5bb8cbb
  胡占生 authored Jul 08, 2023
  
  b5bb8cbb
- 合并冲突 · ff49d463
  yf authored Jul 08, 2023
  
  ff49d463
- 审批流程对接 · ffcc2170
  yf authored Jul 08, 2023
  
  ffcc2170
- Merge branch 'develop' into dev-lv · 18b6124e
  wei authored Jul 08, 2023
  
  18b6124e
- add. · febf2825
  wei authored Jul 08, 2023
  
  febf2825
- fix: 底部状态栏功能修复 · a9485f95
  胡占生 authored Jul 08, 2023
  
  a9485f95
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into develop · ce5d2251
  胡占生 authored Jul 08, 2023
  
  ce5d2251
- Merge branch 'dev-yf'' into 'develop' · 4a105568
  杨帆 authored Jul 08, 2023
```
Dev yf'

See merge request !7
```
  4a105568
- Dev yf' · beabfc7e
  杨帆 authored Jul 08, 2023
  
  beabfc7e
- fix: 创建任务，多选增加全选 bug修复 · fddcc558
  胡占生 authored Jul 08, 2023
  
  fddcc558
- 合并冲突 · 4dbf4c0a
  yf authored Jul 08, 2023
  
  4dbf4c0a
- 修改任务详情页按钮权限 · 73ecd48a
  yf authored Jul 08, 2023
  
  73ecd48a
- Merge branch 'develop' into dev-lv · e1ca3828
  wei authored Jul 08, 2023
  
  e1ca3828
- Merge branch 'dev-yf'' into 'develop' · 046e8203
  杨帆 authored Jul 08, 2023
```
Dev yf'

See merge request !6
```
  046e8203
- Dev yf' · a3243bcf
  杨帆 authored Jul 08, 2023
  
  a3243bcf
- ii · 357cbd89
  wei authored Jul 08, 2023
  
  357cbd89
- 修改任务详情界面 · 1f9b4ea7
  yf authored Jul 08, 2023
  
  1f9b4ea7
- update · 069751ca
  wei authored Jul 08, 2023
  
  069751ca
- timestampToTimes · 82de89d7
  wei authored Jul 08, 2023
  
  82de89d7
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-yf' · 3e28a55e
  yf authored Jul 08, 2023
  
  3e28a55e
07 Jul, 2023 15 commits
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into develop · b6065533
  胡占生 authored Jul 07, 2023
  
  b6065533
- fix: 创建任务，多选增加全选 · 15236232
  胡占生 authored Jul 07, 2023
  
  15236232
- Merge branch 'dev-lv' into develop · 52960c74
  wei authored Jul 07, 2023
  
  52960c74
- 修改详情页 · ad649930
  wei authored Jul 07, 2023
  
  ad649930
- fix: 创建任务，关联项目选择优化 · 543bfad3
  胡占生 authored Jul 07, 2023
  
  543bfad3
- Merge branch 'dev-yf'' into 'develop' · feb12cdb
  杨帆 authored Jul 07, 2023
```
Dev yf'

See merge request !5
```
  feb12cdb
- Dev yf' · a99a74da
  杨帆 authored Jul 07, 2023
  
  a99a74da
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-yf' · fa2a3f85
  yf authored Jul 07, 2023
  
  fa2a3f85
- 修改选组织组件 · 7a73ca0a
  yf authored Jul 07, 2023
  
  7a73ca0a
- 新增四色图 · 6bac48e8
  wei authored Jul 07, 2023
  
  6bac48e8
- Merge branch 'develop' into dev-lv · 434fdbf2
  wei authored Jul 07, 2023
  
  434fdbf2
- Merge branch 'dev-yf'' into 'develop' · 06bee1e2
  杨帆 authored Jul 07, 2023
```
Dev yf'

See merge request !4
```
  06bee1e2
- Dev yf' · 454d5624
  杨帆 authored Jul 07, 2023
  
  454d5624
- kk · 93f5d01a
  wei authored Jul 07, 2023
  
  93f5d01a
- Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-yf' · 019786f5
  yf authored Jul 07, 2023
  
  019786f5