解决冲突

2022-04-06 20:23:38 +08:00
parent 9fefb78dd8
commit 675a750ae6
12 changed files with 11532 additions and 84 deletions
--- a/src/app/routes/datatable/components/datascreen/curve/map.component.html
+++ b/src/app/routes/datatable/components/datascreen/curve/map.component.html
@ -0,0 +1 @@
+<g2-custom delay="100" (render)="render($event)"></g2-custom>
				`@ -0,0 +1 @@`
				`<g2-custom delay="100" (render)="render($event)"></g2-custom>`