From ebda5e08f2c9e7a8c4fec39e59c2753c6bd45372 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 09 四月 2026 09:26:01 +0800
Subject: [PATCH] 灵活用工工资计算，修改bug

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

diff --git a/.gitignore b/.gitignore
index 4154395..82bdfed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,5 +38,12 @@
 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
+sqlsugar 浠ｇ爜鐢熸垚鍣�/

--
Gitblit v1.9.1