Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-06-03 01c34b837d1ec89c0789a0a0c837f7b0639ed31a

 ruoyi-ui/src/utils/generator/render.js

@@ -26,6 +26,11 @@
}



const componentChild = {

  'el-button': {

    default(h, conf, key) {

      return conf[key]

    },

  },

  'el-input': {

    prepend(h, conf, key) {

      return <template slot="prepend">{conf[key]}</template>