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

疯狂的狮子li

2021-06-02 a4edce5a93628e459f0c63071e6383383d86520c

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