From 5856a6e5de198436bc112923609db21c9a45fd10 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 01 七月 2025 15:58:42 +0800
Subject: [PATCH] 增加公司收藏工人的功能

---
 .gitignore |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4e41395..6d86cfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,11 @@
 cylsg/cylsg.Application/cylsg.Application.xml
 cylsg/cylsg.Web.Entry/application.log
 cylsg/cylsg.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
+<<<<<<< HEAD
+cylsg/ECTESTOA/bin/
+cylsg/ECTESTOA/obj/
+=======
+cylsg/ECTESTOA/obj/
+cylsg/ECTESTOA/bin/
+>>>>>>> cyronghe
+*.log

--
Gitblit v1.9.1