Merge branch 'dev3.0' of http://111.198.10.15:12003/gitbucket/git/codedev/smartwell

Fork: 0

codedev / smartwell_front

Browse code Merge branch 'dev3.0' of http://111.198.10.15:12003/gitbucket/git/codedev/smartwell_front into dev3.0 Conflicts: mock/index.js dev-bjgas dev3.0 v3.3.0.1 V3.3.0
commit 799c7a0f5d747b937dc46ac387a891948c0e749c 2 parents ea43725 + 6d65ccc StephanieGitHub authored on 12 May 2022

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View mock/deviceManage/device.js 0 → 100644

Ignore Space Show notes View mock/index.js

Ignore Space Show notes View src/views/deviceManage/deviceType/deviceType.vue

Show line notes below