From 183d1e50c7b9a040e39eec36de81e5331aa7b31c Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 26 三月 2025 08:58:12 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/resources/application.yml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/resources/application.yml b/rsf-server/src/main/resources/application.yml
index 94a4edf..b6c0ce1 100644
--- a/rsf-server/src/main/resources/application.yml
+++ b/rsf-server/src/main/resources/application.yml
@@ -26,12 +26,13 @@
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     map-underscore-to-camel-case: true
     cache-enabled: true
+    call-setters-on-nulls: true
   global-config:
     :banner: false
     db-config:
       id-type: auto
-      logic-delete-value: 1
-      logic-not-delete-value: 0
+#      logic-delete-value: 1
+#      logic-not-delete-value: 0
 
 super:
   pwd: xltys1995

--
Gitblit v1.9.1