conflict

Your Name

2022-08-25 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6

 src/views/loginPage/loginPage.vue

@@ -7,7 +7,7 @@
            <el-col :md="12">
                <div class="loginContL">
                    <div class="apTitleT">新疆国泰新华</div>
                    <div class="apTitleB">安全风险预警监测系统</div>
                    <div class="apTitleB">安全风险预警监测系统（试运行）</div>
                    <span></span>
                </div>
            </el-col>
@@ -151,7 +151,7 @@
            }
            .apTitleB {
                color: #01d0ff;
                margin-bottom: 40px;
                margin-bottom: 36px;
                letter-spacing: 4px;
            }
            & > span {