merge code from dev

hjzheng · hjzheng · commit 356b31c93069 · 2019-01-28T13:51:40.000+08:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ccms-components",
-  "version": "2.37.11",
+  "version": "2.37.12",
   "description": "shuyun ccms components",
   "keywords": [
     "angular",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ccms-components",`
`3`		`- "version": "2.37.11",`
	`3`	`+ "version": "2.37.12",`
`4`	`4`	`"description": "shuyun ccms components",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"angular",`