Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot into feature/noticews

# Conflicts:
#	sql/mysql5/youlai_boot.sql
#	src/main/java/com/youlai/boot/module/websocket/service/MessageService.java
#	src/main/java/com/youlai/boot/module/websocket/service/WebsocketService.java
#	src/main/java/com/youlai/boot/module/websocket/service/impl/WebsocketServiceImpl.java
#	src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java

src/main/java/com/youlai/boot/common/enums/EnvEnum.java

@@ -0,0 +1,26 @@
+package com.youlai.boot.common.enums;
+
+import com.youlai.boot.common.base.IBaseEnum;
+import lombok.Getter;
+
+/**
+ * 环境枚举
+ *
+ * @author Ray
+ * @since 4.0.0
+ */
+@Getter
+public enum EnvEnum implements IBaseEnum<String> {
+
+    DEV("dev", "开发环境"),
+    PROD("prod", "生产环境");
+
+    private final String value;
+
+    private final String label;
+
+    EnvEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+}