Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2022-01-12 5413b37d71ddbaa42dc6f1ba7b885a322b9a3871

 ruoyi-ui/src/components/IconSelect/index.vue

@@ -25,10 +25,9 @@
  },
  methods: {
    filterIcons() {
      this.iconList = icons
      if (this.name) {
        this.iconList = this.iconList.filter(item => item.includes(this.name))
      } else {
        this.iconList = icons
      }
    },
    selectedIcon(name) {