Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/xc-business-system into dev
commit 7d8de3b19a1f6f4bc8aa4b3571bd09bdffe820f5
2 parents ceeca3c + 16c3185
lyg authored on 28 Nov
Showing 10 changed files
View
src/components/QRcodeDeviceDialog/index.vue
View
src/components/ScanSampleDialog/index.vue
View
src/components/scanEquipmentDialog/index.vue
View
src/store/modules/websocket.ts
View
src/views/dataManagement/indexBak.vue 0 → 100644
View
src/views/resource/customer/contract/list.vue
View
src/views/resource/file/change/dialog/selectSysFileDialog.vue
View
src/views/resource/file/grantNotice/detail.vue
View
src/views/resource/file/grantNotice/dialog/selectCustomerContratList.vue 0 → 100644
View
src/views/resource/file/grantNotice/dialog/selectFileTypeDialog.vue