From f85bad33886c792e5968e8583cbfbbf76dbcf8d7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 22 九月 2021 11:10:10 +0800
Subject: [PATCH] update 调整依赖结构 解决依赖冲突

---
 ruoyi-admin/src/main/resources/application.yml |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 6e4888d..fa95235 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -109,7 +109,7 @@
 # 閲嶅鎻愪氦
 repeat-submit:
   # 鍏ㄥ眬闂撮殧鏃堕棿(姣)
-  intervalTime: 1000
+  interval: 5000
 
 # MyBatisPlus閰嶇疆
 # https://baomidou.com/config/
@@ -134,8 +134,6 @@
   # REUSE锛氳鎵ц鍣ㄧ被鍨嬩細澶嶇敤棰勫鐞嗚鍙ワ紙PreparedStatement锛�
   # BATCH锛氳鎵ц鍣ㄧ被鍨嬩細鎵归噺鎵ц鎵�鏈夌殑鏇存柊璇彞
   executorType: SIMPLE
-  # 鎸囧畾澶栭儴鍖� MyBatis Properties 閰嶇疆锛岄�氳繃璇ラ厤缃彲浠ユ娊绂婚厤缃紝瀹炵幇涓嶅悓鐜鐨勯厤缃儴缃�
-  configurationProperties: null
   configuration:
     # 鑷姩椹煎嘲鍛藉悕瑙勫垯锛坈amel case锛夋槧灏�
     # 濡傛灉鎮ㄧ殑鏁版嵁搴撳懡鍚嶇鍚堣鍒欐棤闇�浣跨敤 @TableField 娉ㄨВ鎸囧畾鏁版嵁搴撳瓧娈靛悕
@@ -204,7 +202,7 @@
       # 瀛楁楠岃瘉绛栫暐涔� update,鍦� update 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
       updateStrategy: NOT_NULL
       # 瀛楁楠岃瘉绛栫暐涔� select,鍦� select 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐鏃� wrapper 鏍规嵁鍐呴儴 entity 鐢熸垚鐨� where 鏉′欢
-      selectStrategy: NOT_NULL
+      where-strategy: NOT_NULL
 
 # Swagger閰嶇疆
 swagger:

--
Gitblit v1.9.3