Merge branch 'master' of http://192.168.4.105:8080/gitbucket/git/08335/hivui-platform-template
# Conflicts: # package.json |
---|
assets_platform/element-ui2.15.7/fonts/element-icons.ttf 0 → 100644 |
---|
Not supported
|
assets_platform/element-ui2.15.7/fonts/element-icons.woff 0 → 100644 |
---|
Not supported
|
assets_platform/element-ui2.15.7/index.css 0 → 100644 |
---|
assets_platform/element-ui2.15.7/index.js 0 → 100644 |
---|
assets_platform/vue2.6.14/vue.min.js 100644 → 0 |
---|
build/bin/oper.sh |
---|
build/doc.txt 100644 → 0 |
---|
build/nginx配置说明.txt 100644 → 0 |
---|
build/webpack.base.conf.js |
---|
build/webpack.prod.conf.js |
---|
package.json |
---|
project/hivuiMain/views/taskCenter.vue |
---|