Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-03-16 b671918bc69a0cc7db13b8fae2759775bb8ca074

 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,