From 477660862acda5b81386c365c3e0e3f532c4a061 Mon Sep 17 00:00:00 2001
From: Jerome Lin <jerome.lin@zhongan.com>
Date: Mon, 28 Aug 2017 16:20:31 +0800
Subject: [PATCH] v1.0.15

---
 CHANGELOG.md | 5 +++++
 package.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9598d32a3..e65282880 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # 版本更新日志 
 
+## v1.0.15
+- Bug Fix
+  - 修复`Badge`组件没有载入原生属性的bug。（[20a66f8](https://github.com/ZhonganTechENG/zarm/commit/32879261a694fe5a09820035217105e7b9fd3154)）
+  - 修复`Input`组件maxLength属性没有载入的bug。（[ef199da](https://github.com/ZhonganTechENG/zarm/commit/20a66f854b9d5b997c9ca29291a6a9ef6d54b60d)）
+
 ## v1.0.14
 - Break Change
   - `Progress`组件type属性更名为shape，表示形状。（[f2cccd5](https://github.com/ZhonganTechENG/zarm/commit/1b87e889e80df8b43ede6c4e07c19a0b1cc20e30)）
diff --git a/package.json b/package.json
index df0823023..a7916524f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zarm",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "基于 React 的移动端UI库",
   "tags": [
     "zarm",