Commit Graph

127 Commits

Author SHA1 Message Date
jiang f1f40d4374 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/resources/mappers/app/PartApplyAppMapper.xml
2025-10-27 14:56:39 +08:00
jiang dee44396b0 漏洞修改 2025-10-27 14:56:12 +08:00
jiang c82cae618c 漏洞修改 2025-08-29 17:29:00 +08:00
jiang c53ff7bfd9 Merge remote-tracking branch 'origin/master' 2025-08-24 19:25:14 +08:00
jiang f475e0776e 漏洞修改 2025-08-24 19:24:29 +08:00
syruan 9b636ff5de 修复配件入库SQL查询问题 2025-07-22 10:27:53 +08:00
jiang 9c5284cc58 Merge remote-tracking branch 'origin/master' 2025-07-17 17:20:51 +08:00
jiang 4f8501bca3 1 2025-07-17 17:20:41 +08:00
hayu 8466b4d9d4 设备工程领用配件统计 2025-07-17 16:56:44 +08:00
hayu fc67b62448 功能修改 2025-07-17 14:22:15 +08:00
hayu 73b8ebfd68 配件规格排序 2025-07-16 22:48:48 +08:00
syruan 8a283c3bfa 配件批量审核 2025-07-15 20:31:06 +08:00
hayu f815734fda 问题修改,功能开发 2025-07-15 20:27:42 +08:00
hayu 2cf48d0f35 问题修改,功能开发 2025-07-14 18:40:16 +08:00
syruan 9b9fa60a92 dev(environment): 切换到本地环境并更新数据库配置
-将 spring.profiles.active 从 saas 改为 local
- 更新本地数据库配置,包括 URL、用户名和密码
- 在 PartApplyAppMapper 和 PartApplyMapper 中添加 status 参数的条件判断
2025-07-08 11:04:47 +08:00
syruan 5909d5f358 退还日期 2025-06-29 18:24:48 +08:00
hongchao ec57c15642 配件入库修改中文名和附件名称 2025-04-23 13:20:13 +08:00
lSun 8c755f9644 需求计划管理归还日期全部改为预计使用时间 2025-03-26 17:42:07 +08:00
syruan 382450d9ac 增加Redis反序列化处理 2025-03-26 14:15:06 +08:00
cwchen d8c7ec21d5 需求计划撤回 2025-03-24 14:44:46 +08:00
cwchen 147732e3f0 需求计划撤回 2025-03-24 09:14:07 +08:00
lSun 36e8aa1188 机具需求计划机具类型里面表格导入 2025-03-21 18:23:25 +08:00
lSun 36eb289e97 机具需求计划机具类型里面,不要体现外租设备,(外租资产类不允许选择) 2025-03-19 09:18:21 +08:00
syruan a1602b3c19 退还日期 2025-03-17 13:40:13 +08:00
hayu 2ee86759ae 后台增加配件领料功能,以及其他问题修复 2025-03-10 11:34:49 +08:00
hayu 8fd45a5d37 入库人改为自动获取 2025-03-08 09:33:15 +08:00
liang.chao b6b7612715 web端配件领用申请 2025-03-07 10:46:14 +08:00
hayu 4b21b55246 不获取外租资产类,入库人改为自动获取,以及其他修改 2025-03-04 09:19:30 +08:00
cwchen cf4fa55eff 问题修改 2025-01-24 15:19:29 +08:00
cwchen 077fb4d512 问题修改 2025-01-24 14:34:48 +08:00
cwchen 01b5fa5b37 问题修改 2025-01-22 15:57:08 +08:00
haozq a123d3730e Merge remote-tracking branch 'origin/master' 2025-01-16 19:22:45 +08:00
haozq 8fb41bb4d4 BUG修改 2025-01-16 19:22:29 +08:00
cwchen cec21be80a 跳转登录是否合法 2024-11-27 16:08:52 +08:00
haozq 01523714f7 BUG修改 2024-11-21 14:00:35 +08:00
haozq b2bf6135d4 BUG修改 2024-11-16 18:14:24 +08:00
haozq e45e662644 BUG修改 2024-11-16 18:04:26 +08:00
haozq 54174e1805 BUG修改 2024-11-16 17:59:17 +08:00
haozq a73d8eda37 BUG修改 2024-11-16 17:51:38 +08:00
haozq 3b8810454e BUG修改 2024-11-16 17:31:50 +08:00
haozq 346d0f2b1a BUG修改 2024-11-16 17:18:35 +08:00
haozq 9596bc5160 BUG修改 2024-11-16 17:15:45 +08:00
haozq 44b3f74168 BUG修改 2024-11-16 16:53:04 +08:00
haozq 41fb2ae361 BUG修改 2024-11-16 15:34:40 +08:00
haozq 67753c967d BUG修改 2024-11-16 14:38:06 +08:00
haozq 3740ebe437 BUG修改 2024-11-16 14:36:52 +08:00
haozq 8e3451c397 BUG修改 2024-11-16 14:17:59 +08:00
haozq 4a55a3858e BUG修改 2024-11-16 13:45:52 +08:00
haozq e509b09866 BUG修改 2024-11-15 19:35:22 +08:00
haozq 03fb81596f BUG修改 2024-11-15 19:12:50 +08:00