From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显

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

diff --git a/.gitignore b/.gitignore
index 28c91ac..6bb8c15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,7 @@
 !*/build/*.java
 !*/build/*.html
 !*/build/*.xml
-/ruoyi-admin/src/main/resources/application.yml
-/ruoyi-admin/src/main/resources/application-druid.yml
-/ruoyi-admin/src/main/resources/logback.xml
-/ruoyi-generator/src/main/resources/generator.yml
+#/ruoyi-admin/src/main/resources/application.yml
+#/ruoyi-admin/src/main/resources/application-druid.yml
+#/ruoyi-admin/src/main/resources/logback.xml
+#/ruoyi-generator/src/main/resources/generator.yml

--
Gitblit v1.9.3