解决冲突

This commit is contained in:
wangshiming
2022-04-07 19:51:54 +08:00
parent df9fda1057
commit f0cfb3b874
4 changed files with 28 additions and 20 deletions

View File

@ -4,8 +4,8 @@
* @Author : Shiming
* @Date : 2022-04-06 17:57:07
* @LastEditors : Shiming
* @LastEditTime : 2022-04-07 15:48:36
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\curve\\map.component.html
* @LastEditTime : 2022-04-07 19:44:32
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\map\\map.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<g2-custom delay="200" (render)="render($event)"></g2-custom>
<g2-custom delay="200" (render)="render($event)" ></g2-custom>