From d70a80b04a5d865fadc71a966f6d28b7bc37ac1f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 12 十一月 2024 16:21:09 +0800
Subject: [PATCH] Merge branch '互联网' of http://42.193.1.25:9521/r/~qirong/qyspzw into 互联网

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

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 6d6628d..1a323d9 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -151,6 +151,9 @@
   typeAliasesPackage: org.dromara.**.domain
   global-config:
     dbConfig:
+      logic-delete-field: deleted # 鍏ㄥ眬鎸囧畾閫昏緫鍒犻櫎瀛楁
+      logic-delete-value: 1 # 閫昏緫鍒犻櫎鍚庣殑鍊�
+      logic-not-delete-value: 0 # 娌℃湁鍒犻櫎鐨勫��
       # 涓婚敭绫诲瀷
       # AUTO 鑷 NONE 绌� INPUT 鐢ㄦ埛杈撳叆 ASSIGN_ID 闆姳 ASSIGN_UUID 鍞竴 UUID
       # 濡傞渶鏀逛负鑷 闇�瑕佸皢鏁版嵁搴撹〃鍏ㄩ儴璁剧疆涓鸿嚜澧�
@@ -256,7 +259,7 @@
 
 --- # websocket
 websocket:
-  enabled: true
+  enabled: false
   # 璺緞
   path: /resource/websocket
   # 璁剧疆璁块棶婧愬湴鍧�

--
Gitblit v1.8.0