From 24d3def5fd8dc526ce9439449d2725b529e394f2 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 22 Sep 2024 13:02:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test

---
 dyh-service/dyh-cust/src/main/resources/config/application.yml |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dyh-service/dyh-cust/src/main/resources/config/application.yml b/dyh-service/dyh-cust/src/main/resources/config/application.yml
index 7726b04..14865eb 100644
--- a/dyh-service/dyh-cust/src/main/resources/config/application.yml
+++ b/dyh-service/dyh-cust/src/main/resources/config/application.yml
@@ -16,6 +16,7 @@
   main:
     #可以重复命名配置
     allow-bean-definition-overriding: true
+    allow-circular-references: true
 
 #server配置
 server:
@@ -53,10 +54,10 @@
         capital-mode: true
         #全局逻辑删除的实体字段名
         #logic-delete-field: flag
-        #逻辑未删除值(默认为 1),实体类字段需要加上@TableLogic
-        logic-not-delete-value: 1
-        #逻辑已删除值(默认为 0)
-        logic-delete-value: 0
+        #逻辑未删除值(默认为 0),实体类字段需要加上@TableLogic
+        logic-not-delete-value: 0
+        #逻辑已删除值(默认为 1)
+        logic-delete-value: 1
         #字段策略,IGNORED:忽略判断,NOT_NULL:非null判断,NOT_EMPTY:非空判断,DEFAULT:默认,NEVER:不加入sql
         update-strategy: IGNORED
   mapper-locations: classpath*:/cn/huge/*/*/dao/mapper/xml/*Mapper.xml

--
Gitblit v1.8.0