Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into sms_temp_zzf_0127

 Conflicts:

	pom.xml

	src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java

	src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java

	src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java

	src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java

	src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/RedisKeyConstants.java

	src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java

	src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java

src/main/java/cn/iocoder/dashboard/common/enums/OldCommonStatusEnum.java

@@ -1,27 +0,0 @@
-package cn.iocoder.dashboard.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 通用状态枚举
- *
- * @author 芋道源码
- */
-@Getter
-@AllArgsConstructor
-public enum OldCommonStatusEnum {
-
-    ENABLE("0", "开启"),
-    DISABLE("1", "关闭");
-
-    /**
-     * 状态值
-     */
-    private final String status;
-    /**
-     * 状态名
-     */
-    private final String name;
-
-}

src/main/java/cn/iocoder/dashboard/common/enums/UserTypeEnum.java

@@ -0,0 +1,25 @@
+package cn.iocoder.dashboard.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 全局用户类型枚举
+ */
+@AllArgsConstructor
+@Getter
+public enum UserTypeEnum {
+
+    MEMBER(1, "会员"), // 面向 c 端，普通用户
+    ADMIN(2, "管理员"); // 面向 b 端，管理后台
+
+    /**
+     * 类型
+     */
+    private final Integer value;
+    /**
+     * 类型名
+     */
+    private final String name;
+
+}