Merge branches 'master' and 'xtyasrs' of https://gitee.com/luxiaotao1123/zy...

luxiaotao1123

2020-07-15 05ebcccc2c8099c0252501fea0e1797e5a1361d2

 src/main/webapp/static/css/common.css

@@ -1,9 +1,9 @@
*, *::before, *::after {
    -webkit-box-sizing: border-box;
    box-sizing: border-box;
    margin: 0;
    padding: 0;
}
/**, *::before, *::after {*/
/*    -webkit-box-sizing: border-box;*/
/*    box-sizing: border-box;*/
/*    margin: 0;*/
/*    padding: 0;*/
/*}*/

body {
    background-color: #fff;