Merge branch 'master' of https://gitee.com/jyyforjava/zq-erp

wzy

2020-12-14 d151ab96d31e8c581f71e9185d895d1a589e829c

 zq-erp/src/main/resources/static/css/style.min.css

@@ -7128,7 +7128,7 @@
}

.echarts {
   height: 240px
   height: 400px
}

.checkbox-inline, .checkbox-inline+.checkbox-inline, .radio-inline,