GitBucket
|
Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smartKitchenFront into dev
Conflicts: src/components/mycomponent/dialog/productListAddDialog.vue |
|---|
|
|
| src/views/dashboard/components/dashboardHeader.vue 0 → 100644 |
|---|
| src/views/dashboard/components/switch.vue 0 → 100644 |
|---|
| src/views/dashboard/devicePanel.vue 0 → 100644 |
|---|
| src/views/dashboard/index.vue |
|---|
| src/views/dashboard/managementPanel.vue 0 → 100644 |
|---|
| src/views/dashboard/supplierPanel.vue 0 → 100644 |
|---|