From cd411e7b3ade23951e8935924252f7059cc096d5 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 03 Jun 2021 11:23:05 +0800
Subject: [PATCH] 合并冲突

---
 widgets/Layermanagement/Widget.html |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/widgets/Layermanagement/Widget.html b/widgets/Layermanagement/Widget.html
index aea1a74..77f3cfd 100644
--- a/widgets/Layermanagement/Widget.html
+++ b/widgets/Layermanagement/Widget.html
@@ -11,4 +11,16 @@
 			<ul id="treeDemo" class="ztree"></ul>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
+
+
+<!-- {config.json--widgetOnScreen--widgets
+	"uri": "widgets/Layermanagement/Widget",
+	"position": {
+	  "right": 82,
+	  "top": 20,
+	  "height": "32px",
+	  "width": "72px",
+	  "relativeTo": "map"
+	}
+  }, -->
\ No newline at end of file

--
Gitblit v1.9.3