From d295f3c51271c26a5f65c0184bfa27fe1af80f54 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 四月 2023 14:06:07 +0800
Subject: [PATCH] 修复合并后的问题

---
 src/main/resources/application.yml |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4efb527..c0615df 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,14 +3,4 @@
     name: wvp
   profiles:
     active: local
-  # flayway鐩稿叧閰嶇疆
-  flyway:
-    enabled: true   #鏄惁鍚敤flyway(榛樿true)
-    locations: classpath:db/migration   #杩欎釜璺緞鎸囩殑鏄痜ly鐗堟湰鎺у埗鐨剆ql璇彞瀛樻斁鐨勮矾寰�,鍙互澶氫釜锛屽彲浠ョ粰姣忎釜鐜浣跨敤涓嶅悓浣嶇疆,姣斿classpath:db/migration,classpath:test/db/migration
-    baseline-on-migrate: true   #寮�鍚嚜鍔ㄥ垱寤篺lyway鍏冩暟鎹〃鏍囪瘑 榛樿: false
-    # 涓� baseline-on-migrate: true 鎼厤浣跨敤,灏嗗綋鍓嶆暟鎹簱鍒濆鐗堟湰璁剧疆涓�0
-    baseline-version: 0
-    clean-disabled: true    #绂佹flyway鎵ц娓呯悊
-    # 鍋囧宸茬粡鎵ц浜嗙増鏈�1鍜岀増鏈�3锛屽鏋滃鍔犱簡涓�涓増鏈�2锛屼笅闈㈣繖涓�夐」灏嗕細鍏佽鎵ц鐗堟湰2鐨勮剼鏈�
-    out-of-order: true
-    table: flyway_schema_history_${spring.application.name}  #鐢ㄤ簬璁板綍鎵�鏈夌殑鐗堟湰鍙樺寲璁板綍
\ No newline at end of file
+    include: device-compatible
\ No newline at end of file

--
Gitblit v1.8.0