From 093f2117e4c6223b9b303baccd03c04ba49eb797 Mon Sep 17 00:00:00 2001
From: linju <linju@dcloud.io>
Date: Mon, 16 May 2022 17:02:05 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81=E7=99=BB=E9=99=86=E3=80=81=E7=BB=91=E5=AE=9A=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E7=A0=81=E6=96=B0=E5=A2=9E=E9=98=B2=E5=88=B7?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E3=80=82=E5=BD=93=E7=9F=AD=E4=BF=A1=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81=E8=BE=93=E5=85=A5=E9=94=99=E8=AF=AF2?=
 =?UTF-8?q?=E6=AC=A1=E4=BB=A5=E4=B8=8A=EF=BC=8C=E5=BC=B9=E5=87=BA=E5=9B=BE?=
 =?UTF-8?q?=E5=BD=A2=E9=AA=8C=E8=AF=81=E7=A0=81=E8=BF=9B=E8=A1=8C=E4=BA=BA?=
 =?UTF-8?q?=E6=9C=BA=E6=A0=A1=E9=AA=8C=E3=80=82=20-=20uni-id-cf=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=98=B2=E5=88=B7=E6=9C=BA=E5=88=B6=E3=80=82?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9loginLog=E4=B8=BAuniIdLog=20=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=90=84=E7=B1=BBuni-id=E6=93=8D=E4=BD=9C=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E6=96=B0=E5=A2=9Eaction=E5=AD=97=E6=AE=B5=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=93=8D=E4=BD=9C=E7=9A=84=E8=A1=8C=E4=B8=BA=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=20-=20=E6=B3=A8=E5=86=8C=E8=B4=A6=E5=8F=B7=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=9C=80=E8=A6=81=E8=BE=93=E5=85=A5=E5=9B=BE=E5=BD=A2?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.md | 4 +---
 package.json | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/changelog.md b/changelog.md
index 70fad46d..e6bab784 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,4 @@
-## 1.1.36（2022-05-16）
-解决多个db_init的冲突
-## 1.1.35（2022-05-16）
+## 1.2.0（2022-05-16）
 - 短信验证码登陆、绑定手机号码新增防刷逻辑。当短信验证码输入错误2次以上，弹出图形验证码进行人机校验。
 - uni-id-cf，新增防刷机制。更改loginLog为uniIdLog 记录各类uni-id操作，并新增action字段记录操作的行为名称
 - 注册账号新增需要输入图形验证码
diff --git a/package.json b/package.json
index ef8b5af0..0cbc11f2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"id": "uni-starter",
 	"displayName": "uni-starter",
-	"version": "1.1.36",
+	"version": "1.2.0",
 	"description": "云端一体应用快速开发基本项目模版",
 	"keywords": [
         "login",
-- 
GitLab