Merge branch 'put-net' into 'master'

Put net See merge request engintime/Dream-Logic/Project-Template/DM1000/DM1000!10

Merge branch 'put-net' into 'master'
601a24e8 · 赵鹏翀 · 94a9ec53 · b78d43c7 · 601a24e8 · 601a24e8
--- a/DM1000.dlsche
+++ b/DM1000.dlsche
--- a/DM1000.dlsche.svg
+++ b/DM1000.dlsche.svg
@@ -935,7 +935,11 @@

  <polyline fill="none" points="3599 43, 3599 4473" stroke="#000000" stroke-dasharray="200,100" stroke-linecap="round" stroke-linejoin="round" stroke-width="50"/>

+<<<<<<< HEAD
+  <text alignment-baseline="after-edge" fill="#000000" font-family="微软雅黑" font-size="60" font-weight="700" text-anchor="start" x="991" y="684">(C)北京英真时代科技有限公司。保留所有权利。</text>
+=======
  <polyline fill="none" points="4909 943, 5129 943, 5129 2443" stroke="#ff8000" stroke-linecap="round" stroke-linejoin="round" stroke-width="20"/>
+>>>>>>> 94a9ec53692021a6457d6e493955e40c4c67fcad

  <text alignment-baseline="after-edge" fill="#000000" font-family="微软雅黑" font-size="400" font-weight="700" text-anchor="start" x="959" y="613">DM1000</text>