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

疯狂的狮子Li

2021-11-28 a627de02c750f6af4c524aff75d28343226f2a82

 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) {