20240205 解决冲突

This commit is contained in:
2024-02-05 15:01:06 +08:00
233 changed files with 65548 additions and 2659 deletions
-18
View File
@@ -1,18 +0,0 @@
################################################################################
# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。
################################################################################
/SGGLPackFile/PackFile/bin
/SGGLPackFile
/SGGL/FineUIPro.Web/File/Excel/Temp
/SGGL/FineUIPro.Web/FileUpload/QRCodeFile
/SGGL/FineUIPro.Web/FileUpload/DataBase/ConstructionStandardProject/2023-05
/SGGL/FineUIPro.Web/FileUpload/CQMS/InspectionEquipment/2023-05
/SGGL/FineUIPro.Web/FileUpload/CQMS
/SGGL/FineUIPro.Web/FileUpload/LargerHazard/2023-06
/SGGLPackFile.rar
/SGGL/FineUIPro.Web/FileUpload/Solution/2023-08
/SGGL/FineUIPro.Web/FileUpload/ProjectAttachUrl/2023-09
/CreateModel_lpf.bat
/ReleasePackerALL2017 - 副本 (2).bat
/SGGL/FineUIPro.Web/FileUpload/TestRun/DriverPrepare/DriverData/2024-01