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

# Conflicts:
#	pom.xml
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
#	ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
#	ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java
#	ruoyi-gateway/src/main/resources/bootstrap.yml
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
#	ruoyi-ui/vue.config.js
#	ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java

ruoyi-ui/src/views/system/dict/data.vue

@@ -163,7 +163,7 @@
             <el-option
               v-for="item in listClassOptions"
               :key="item.value"
-              :label="item.label"
+              :label="item.label + '(' + item.value + ')'"
               :value="item.value"
             ></el-option>
           </el-select>