From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001
From: KonBAI <1527468660@qq.com>
Date: 星期六, 02 四月 2022 13:02:56 +0800
Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本,处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。

---
 ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java |   35 ++++++++++++++++-------------------
 1 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java
index 86ac706..1b41c66 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java
@@ -1,5 +1,7 @@
 package com.ruoyi.framework.config.properties;
 
+import com.ruoyi.common.enums.CaptchaCategory;
+import com.ruoyi.common.enums.CaptchaType;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
@@ -14,28 +16,23 @@
 @ConfigurationProperties(prefix = "captcha")
 public class CaptchaProperties {
 
-	/**
-	 * 楠岃瘉鐮佸紑鍏�
-	 */
-	private Boolean enabled;
+    /**
+     * 楠岃瘉鐮佺被鍨�
+     */
+    private CaptchaType type;
 
-	/**
-	 * 楠岃瘉鐮佺被鍨�
- 	 */
-    private String type;
+    /**
+     * 楠岃瘉鐮佺被鍒�
+     */
+    private CaptchaCategory category;
 
-	/**
-	 * 楠岃瘉鐮佺被鍒�
-	 */
-    private String category;
-
-	/**
-	 * 鏁板瓧楠岃瘉鐮佷綅鏁�
-	 */
+    /**
+     * 鏁板瓧楠岃瘉鐮佷綅鏁�
+     */
     private Integer numberLength;
 
-	/**
-	 * 瀛楃楠岃瘉鐮侀暱搴�
-	 */
+    /**
+     * 瀛楃楠岃瘉鐮侀暱搴�
+     */
     private Integer charLength;
 }

--
Gitblit v1.9.3