ee13e1a7 by McLemore

Merge branch 'master' into develop

2 parents c6bcf3a1 9bb38c2f
......@@ -2,6 +2,8 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
### [1.2.2](https://gitlab.zb100.com/templates/mui-template/compare/v1.2.1...v1.2.2) (2019-12-17)
### [1.2.1](https://gitlab.zb100.com/templates/mui-template/compare/v1.2.0...v1.2.1) (2019-12-17)
......
{
"name": "@zb100/mui-template",
"version": "1.2.1",
"version": "1.2.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......
{
"name": "@zb100/mui-template",
"version": "1.2.1",
"version": "1.2.2",
"description": "小程序组件模版",
"main": "index.js",
"scripts": {
......