From a9db99df14f82f9d9a966e824d5f39d63d04c18f Mon Sep 17 00:00:00 2001
From: shipengyu <shipengyu@yinzhijie.com>
Date: Fri, 28 Oct 2022 17:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 开发说明.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/开发说明.txt b/开发说明.txt
index ea3fbf8..253f961 100644
--- a/开发说明.txt
+++ b/开发说明.txt
@@ -1 +1,7 @@
 系统换肤功能开发
+<<<<<<< HEAD
+=======
+技术升级
+...
+微服务改造
+>>>>>>> 56cab75 (微服务改造)