Commit Graph
9069 Commits
Author SHA1 Message Date
李鹏宇 d03f53f859 !4129 !4128 添加功能
Merge pull request !4129 from 李鹏宇/dev
2025-07-29 02:21:25 +00:00
李鹏宇 5a99455da2 !4128 添加功能
Merge pull request !4128 from 李鹏宇/dev_zhou
2025-07-29 02:21:00 +00:00
zhou fe6196afd9 添加功能 2025-07-29 10:19:31 +08:00
李鹏宇 c508c10bb4 !4127 !4126 添加功能
Merge pull request !4127 from 李鹏宇/dev
2025-07-28 08:02:10 +00:00
李鹏宇 e90bd28715 !4126 添加功能
Merge pull request !4126 from 李鹏宇/dev_zhou
2025-07-28 08:01:53 +00:00
zhou fc39404716 添加功能 2025-07-28 16:01:18 +08:00
李鹏宇 42295ea20b !4125 !4124 添加功能
Merge pull request !4125 from 李鹏宇/dev
2025-07-28 07:38:48 +00:00
李鹏宇 546f2d6da3 !4124 添加功能
Merge pull request !4124 from 李鹏宇/dev_zhou
2025-07-28 07:38:29 +00:00
zhou bf75bed8a1 添加功能 2025-07-28 15:38:01 +08:00
李鹏宇 4377b03dd6 !4123 添加功能
Merge pull request !4123 from 李鹏宇/dev_zhou
2025-07-28 07:37:01 +00:00
zhou a341d0d442 添加功能 2025-07-28 15:36:29 +08:00
李鹏宇 8df15e6bbc !4122 !4121 添加功能
Merge pull request !4122 from 李鹏宇/dev
2025-07-28 06:47:33 +00:00
李鹏宇 f2581ef767 !4121 添加功能
Merge pull request !4121 from 李鹏宇/dev_zhou
2025-07-28 06:47:02 +00:00
zhou aa9b39fcce 添加功能 2025-07-28 14:46:22 +08:00
李鹏宇 679d48b94c !4120 忽略 **/.DS_Store
Merge pull request !4120 from 李鹏宇/dev
2025-07-28 03:41:49 +00:00
sunjie a7250135d8 忽略 **/.DS_Store 2025-07-28 11:27:59 +08:00
李鹏宇 03d5c3f5ad !4119 !4118 添加功能
Merge pull request !4119 from 李鹏宇/dev
2025-07-28 03:14:32 +00:00
李鹏宇 733e390012 !4118 添加功能
Merge pull request !4118 from 李鹏宇/dev_zhou
2025-07-28 03:14:12 +00:00
zhou 3eea63b6e4 添加功能 2025-07-28 11:13:40 +08:00
李鹏宇 64978d6c15 !4117 !4116 添加功能
Merge pull request !4117 from 李鹏宇/dev
2025-07-28 03:09:12 +00:00
李鹏宇 d281f8bf1a !4116 添加功能
Merge pull request !4116 from 李鹏宇/dev_zhou
2025-07-28 03:08:51 +00:00
zhou 16090d9af5 添加功能 2025-07-28 11:07:19 +08:00
李鹏宇 ebb6fa5026 !4115 !4114 添加功能
Merge pull request !4115 from 李鹏宇/dev
2025-07-28 02:51:59 +00:00
李鹏宇 497d35b4cd !4114 添加功能
Merge pull request !4114 from 李鹏宇/dev_zhou
2025-07-28 02:51:35 +00:00
zhou d6fe8bf577 添加功能 2025-07-28 10:50:22 +08:00
李鹏宇 dfff9f87a5 !4113 1
Merge pull request !4113 from 李鹏宇/dev
2025-07-28 02:10:50 +00:00
李鹏宇 392d466122 1 2025-07-28 10:06:32 +08:00
李鹏宇 44c4746b9e !4112 去掉模板
Merge pull request !4112 from 李鹏宇/dev
2025-07-27 11:37:25 +00:00
sunjie 10f566e00f 去掉模板 2025-07-27 19:36:32 +08:00
李鹏宇 a3c6bc8637 1 2025-07-27 19:34:23 +08:00
李鹏宇 13256bfca2 !4111 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
Merge pull request !4111 from 李鹏宇/dev
2025-07-27 11:31:26 +00:00
sunjie 46e79114fa Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-07-27 19:29:38 +08:00
sunjie d1b95cec8d 去掉模板 2025-07-27 19:29:17 +08:00
李鹏宇 934c917c22 !4110 !4109 添加功能
Merge pull request !4110 from 李鹏宇/dev
2025-07-27 11:21:28 +00:00
李鹏宇 896bd04764 !4109 添加功能
Merge pull request !4109 from 李鹏宇/dev_zhou
2025-07-27 11:21:06 +00:00
zhou 3a2aa43176 添加功能 2025-07-27 19:20:43 +08:00
zhou ff347a414a Merge branch 'dev' into dev_zhou
# Conflicts:
#	yuthon_maintain/models/inherit_maintenance_equipment.py
#	yuthon_maintain/views/maintenance_equipment_views.xml
2025-07-27 19:19:53 +08:00
zhou 8523b5930f 添加功能 2025-07-27 19:17:31 +08:00
李鹏宇 de9d1ea50f !4108 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
Merge pull request !4108 from 李鹏宇/dev
2025-07-27 09:40:51 +00:00
sunjie 150b1b21a7 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev 2025-07-27 17:40:10 +08:00
sunjie d0908958d4 去掉模板 2025-07-27 17:39:55 +08:00
李鹏宇 cf62d6c51d !4107 !4106 添加功能
Merge pull request !4107 from 李鹏宇/dev
2025-07-27 09:39:15 +00:00
李鹏宇 5f376af855 !4106 添加功能
Merge pull request !4106 from 李鹏宇/dev_zhou
2025-07-27 09:38:55 +00:00
zhou 285cede605 添加功能 2025-07-27 17:37:18 +08:00
李鹏宇 1c8e900863 !4105 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
Merge pull request !4105 from 李鹏宇/dev
2025-07-27 09:35:09 +00:00
sunjie 7b7db016db Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
# Conflicts:
#	yuthon_maintain/wizard/__init__.py
2025-07-27 17:33:35 +08:00
sunjie b2de5861dc 去掉模板 2025-07-27 17:32:57 +08:00
李鹏宇 a4d93231c2 !4104 1
Merge pull request !4104 from 李鹏宇/dev
2025-07-27 09:32:51 +00:00
李鹏宇 9108ecdb6e 1 2025-07-27 17:32:04 +08:00
李鹏宇 644e30337c !4103 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev
Merge pull request !4103 from 李鹏宇/dev
2025-07-27 09:24:50 +00:00