From 11dbb3f355771c1d41f260e2ed51b829c05e6427 Mon Sep 17 00:00:00 2001
From: during <during@inrice.com>
Date: Thu, 10 Jun 2021 15:39:07 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=9B=AA?=
 =?UTF-8?q?=E8=8A=B1id=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=98=E6=B2=A1=E6=9C=89=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index eb54d9c64..e2d43e1bd 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -8,7 +8,7 @@ spring:
       master:
         url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
         username: root
-        password: root
+        password: mm123456
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 3ea04c71e..7e3fcde49 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -158,7 +158,7 @@ mybatis-plus:
       # INPUT 用户输入ID
       # ASSIGN_ID 全局唯一ID
       # ASSIGN_UUID 全局唯一ID UUID
-      idType: AUTO
+      idType: ASSIGN_ID
       # 表名前缀
       tablePrefix: null
       # 字段 format,例: %s,(对主键无效)