Merge branch 'ty_urgent' into test

wzy

2020-12-20 53c616910a3fd6f2f9669242690c1c85f2ba0a68

 zq-erp/src/main/resources/static/css/styleOne/login.min.css

@@ -13,7 +13,7 @@
}

.signinpanel {
    width: 750px;
    width: 1000px;
    margin: 10% auto 0
}