Merge remote-tracking branch 'origin/master'

This commit is contained in:
chenghx 2018-08-15 09:53:24 +08:00
commit 198ad8532a

View File

@ -81,6 +81,7 @@ import AIcon from 'ant-design-vue/es/icon/icon'
import AInputGroup from 'ant-design-vue/es/input/Group' import AInputGroup from 'ant-design-vue/es/input/Group'
import AButton from 'ant-design-vue/es/button/button' import AButton from 'ant-design-vue/es/button/button'
import ACol from 'ant-design-vue/es/grid/Col' import ACol from 'ant-design-vue/es/grid/Col'
import ARow from 'ant-design-vue/es/grid/Row'
import ACheckbox from 'ant-design-vue/es/checkbox/Checkbox' import ACheckbox from 'ant-design-vue/es/checkbox/Checkbox'
import AAlert from 'ant-design-vue/es/alert/index' import AAlert from 'ant-design-vue/es/alert/index'
@ -92,6 +93,7 @@ export default {
AAlert, AAlert,
ACheckbox, ACheckbox,
ACol, ACol,
ARow,
AButton, AButton,
AInputGroup, AInputGroup,
AIcon, AIcon,