解决冲突

This commit is contained in:
wangshiming
2022-02-24 10:51:31 +08:00
parent a4a2b45911
commit ad8134c120
3 changed files with 19 additions and 2 deletions

View File

@ -1,3 +1,13 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-27 21:08:36
* @LastEditors : Shiming
* @LastEditTime : 2022-02-24 10:50:46
* @FilePath : \\tms-obc-web\\src\\app\\routes\\passport\\components\\order-agreement\\order-agreement.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<div class="page-box">
<div style="width: 90%; margin: 5rem auto">
<h1 class="mb-md mt-md">