Merge branch 'master' of https://github.com/dcloudio/uni-app

eaaabc4c · 蓝色的小猫咪 · b6d63cca · 009569ed · eaaabc4c
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

examples/hello-uniapp/components/uni-icon.vue examples/hello-uniapp/components/uni-icon.vue +1 -1

未找到文件。
--- a/examples/hello-uniapp/components/uni-icon.vue
+++ b/examples/hello-uniapp/components/uni-icon.vue
@@ -16,7 +16,7 @@
            /**
             * 图标大小
             */
-            size: Number
+            size: [Number, String]
        },
        computed: {
            fontSize() {