From 03685b27052b5127045fce6f0e8beac304ac14d1 Mon Sep 17 00:00:00 2001
From: LanHeron <ymheron@outlook.com>
Date: Sun, 2 Mar 2025 11:56:28 +0800
Subject: [PATCH] vault backup: 2025-03-02 11:56:28

---
 SanPinPLM/相关操作/1.EDM/60.CAD接口使用.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/SanPinPLM/相关操作/1.EDM/60.CAD接口使用.md b/SanPinPLM/相关操作/1.EDM/60.CAD接口使用.md
index 38d595a0..d13442e6 100644
--- a/SanPinPLM/相关操作/1.EDM/60.CAD接口使用.md
+++ b/SanPinPLM/相关操作/1.EDM/60.CAD接口使用.md
@@ -22,14 +22,10 @@
 
 如果不小心删除了图纸上的标题栏，那么通过PLM设计软件接口，可以将标题栏插入到图面上（插入时，标题栏的基准点是右下角）
 
-<<<<<<< HEAD
-![](assets/Pasted%20image%2020250301131934.png)
-=======
 ![](assets/Pasted%20image%2020250302101157.png)
 
 ### 填写标题栏
 
 对于有标题栏的图框，可以通过 **填写标题栏** 功能，将对应的属性值填写到标题栏块的属性中，填写后这些值会自动出现在图面上
 
-![](assets/Pasted%20image%2020250302101643.png)
->>>>>>> origin/main
+![](assets/Pasted%20image%2020250302101643.png)
\ No newline at end of file