Commits · master · 中汽测评-信息安全测评系统 / web

09 Apr, 2024 1 commit
- Merge branch 'develop' into 'master' · 506847e9
  盖献康 authored Apr 09, 2024
```
Develop - Master 4.0

See merge request !4
```
  506847e9
08 Apr, 2024 3 commits
- feat(概览): 71072 · f2300040
  高滢 authored Apr 08, 2024
  
  f2300040
- Merge branch 'develop' into developer/yanjiaxu · 7b7f99a0
  jiaxu.yan authored Apr 08, 2024
```
# Conflicts:
#	src/views/processing/archivedTask/index.vue
#	src/views/processing/processed-review/index.vue
#	src/views/processing/unprocessed-review/index.vue
#	src/views/task/on/index.vue
```
  7b7f99a0
- fix: 71070 71060 71051 71040 71027 · 39d2537c
  jiaxu.yan authored Apr 08, 2024
  
  39d2537c
07 Apr, 2024 3 commits
- feat: bug - 71010 · 551b5a38
  盖献康 authored Apr 07, 2024
  
  551b5a38
- Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into developer/gaixiankang · 846088a7
  盖献康 authored Apr 07, 2024
```
# Conflicts:
#	src/store/modules/user.js
```
  846088a7
- feat: bug - 71010 · 38fb4af0
  盖献康 authored Apr 07, 2024
  
  38fb4af0
03 Apr, 2024 9 commits
- fix: 71003 · eb79f00a
  jiaxu.yan authored Apr 03, 2024
  
  eb79f00a
- fix: 代码修改 · 120a96cb
  jiaxu.yan authored Apr 03, 2024
  
  120a96cb
- fix: 70973 70978 · 21a3ab39
  jiaxu.yan authored Apr 03, 2024
  
  21a3ab39
- feat(概览): 70960 · b7e6cbbc
  高滢 authored Apr 03, 2024
  
  b7e6cbbc
- Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into gaoying · 27abf3e3
  高滢 authored Apr 03, 2024
  
  27abf3e3
- feat(任务概览): 统计 · 0e773de3
  高滢 authored Apr 03, 2024
  
  0e773de3
- Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into developer/gaixiankang · 74c407e5
  盖献康 authored Apr 03, 2024
  
  74c407e5
- feat: bug - 70889 · 062790f1
  盖献康 authored Apr 03, 2024
  
  062790f1
- fix: 70944 70893 70949 70963 70954 · 0171fade
  jiaxu.yan authored Apr 03, 2024
  
  0171fade
01 Apr, 2024 16 commits
- fix: 70905 · f2d36a71
  jiaxu.yan authored Apr 01, 2024
  
  f2d36a71
- fix: 70914 70895 · 9791c76e
  jiaxu.yan authored Apr 01, 2024
  
  9791c76e
- fix: 70905 · 2b2c52c2
  jiaxu.yan authored Apr 01, 2024
  
  2b2c52c2
- Merge branch 'develop' into developer/yanjiaxu · 6599fca4
  jiaxu.yan authored Apr 01, 2024
  
  6599fca4
- fix: 70931 · ea52464a
  jiaxu.yan authored Apr 01, 2024
  
  ea52464a
- fix: 70898 · 9949d921
  jiaxu.yan authored Apr 01, 2024
  
  9949d921
- feat: 总任务下文件信息暂时去除 · 43bc470b
  盖献康 authored Apr 01, 2024
  
  43bc470b
- Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into developer/gaixiankang · 7ca5cef6
  盖献康 authored Apr 01, 2024
  
  7ca5cef6
- feat: bug - 70889 · 4cbfa693
  盖献康 authored Apr 01, 2024
  
  4cbfa693
- fix: 70833 · 9a8cee55
  jiaxu.yan authored Apr 01, 2024
  
  9a8cee55
- Merge branch 'develop' into developer/yanjiaxu · 6fe60adb
  jiaxu.yan authored Apr 01, 2024
```
# Conflicts:
#	src/views/processing/carTest/confirmation-test/index.vue
#	src/views/processing/carTest/review-form/index.vue
```
  6fe60adb
- fix: 70856 70859 70862 70896 70897 70899 70908 70909 70910 70914 · 123207d6
  jiaxu.yan authored Apr 01, 2024
  
  123207d6
- Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into mengzixuan · 29cbd7ee
  mengzixuan authored Apr 01, 2024
  
  29cbd7ee
- feat(查看、确认试验方案): 列表修改 · e2795b5c
  mengzixuan authored Apr 01, 2024
  
  e2795b5c
- Merge branch 'mengzixuan' of http://gitlab.91isoft.com:90/car-test/web into develop · 4289fec7
  mengzixuan authored Apr 01, 2024
  
  4289fec7
- feat(确认试验方案): 列表修改 · 0475dbdb
  mengzixuan authored Apr 01, 2024
  
  0475dbdb
29 Mar, 2024 5 commits
- feat(检验内容库): 关联测试用例接口对接 · 3ddd670f
  mengzixuan authored Mar 29, 2024
  
  3ddd670f
- Merge branch 'developer/yanjiaxu' into develop · 65fb0ae2
  jiaxu.yan authored Mar 29, 2024
  
  65fb0ae2
- fix: 70885 70890 70882 · 31b1c1b2
  jiaxu.yan authored Mar 29, 2024
  
  31b1c1b2
- feat(试一下提交): 试 · 144c8c01
  mengzixuan authored Mar 29, 2024
  
  144c8c01
- feat(试一下提交): 试 · 45704118
  mengzixuan authored Mar 29, 2024
  
  45704118
28 Mar, 2024 3 commits
- Merge branch 'developer/yanjiaxu' into develop · 5559fa10
  jiaxu.yan authored Mar 28, 2024
  
  5559fa10
- fix: 70882 · a7517071
  jiaxu.yan authored Mar 28, 2024
  
  a7517071
- feat(样品): 70884 · 03ed089d
  高滢 authored Mar 28, 2024
  
  03ed089d