Merge remote-tracking branch 'origin/dev' into dev

liyang

2022-07-12 918708a227ad8e7bfa03dda018ce49e18da7e794

 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>