Commit Graph

89 Commits (dedd2dc535c7be98a4cc7fb395eb2379eaf23f00)

Author SHA1 Message Date
haha 9f3b2b35b2 update code 2025-02-02 22:46:26 +08:00
haha b682453d76 解决冲突 2025-01-25 23:33:10 +08:00
haha 7978582c60 Merge remote-tracking branch 'origin/dev_xd' into dev_xd 2025-01-25 23:28:33 +08:00
haha 716b388d46 Revert "更新文件"
This reverts commit 886fe18434.
2025-01-25 23:26:46 +08:00
lj7788@126.com af69e57c4f 修改考勤的保存功能 2025-01-25 13:03:47 +08:00
haha 886fe18434 更新文件 2025-01-24 23:40:35 +08:00
haha 19fb6e61f9 动态从身份证图片中获取数据 2025-01-24 23:37:20 +08:00
haha 42e7f1f2c0 修改花名册 2025-01-23 00:02:01 +08:00
姜玉琦 45af87f1f6 提交代码 2025-01-15 23:17:01 +08:00
haha 5be1fdd66a 修改用户增加功能 2025-01-15 00:26:09 +08:00
haha af4cfe9ff8 修改人员增加 2025-01-08 00:24:03 +08:00
姜玉琦 7b08ca2043 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-01-08 00:22:29 +08:00
姜玉琦 785a80f661 提交代码 2025-01-08 00:22:22 +08:00
haha abb4acb456 班组修改 2025-01-07 23:07:35 +08:00
haha 80e68aeae4 在合并 "dev_xd" 和 "origin/dev_xd" 前自动存档 2025-01-07 00:34:41 +08:00
姜玉琦 654d6bf001 提交代码 2025-01-07 00:26:43 +08:00
姜玉琦 0d4b0152d3 提交代码 2025-01-06 23:50:29 +08:00
haha 111be9687a 修改花名册bug 2025-01-06 23:33:36 +08:00
姜玉琦 6cdfdf8da9 提交代码 2025-01-05 17:09:19 +08:00
haha d7a12c5a2a 花名册管理修改保存 2025-01-05 15:44:13 +08:00
姜玉琦 e88f802800 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-01-05 14:51:01 +08:00
姜玉琦 2bd827b5d2 提交代码 2025-01-05 14:50:51 +08:00
haha 9988754739 修改花名册 2025-01-05 01:03:30 +08:00
haha 964a904cc1 修改后台里程碑管理保存的时候如果实际结束日期没有数据保存的时候会自动填充数据,需要改成不填充 2025-01-02 23:34:45 +08:00
haha 011b937191 update .gitignore 2025-01-02 22:33:40 +08:00
姜玉琦 eaa5ad1167 提交代码 2024-12-30 23:08:35 +08:00
haha 0b7801b302 视频监控大屏 2024-12-29 22:10:36 +08:00
haha d3cfe40087 增加监控预览功能 2024-12-28 20:35:20 +08:00
lijun 9d75715d31 add videoMonitor 2024-12-28 09:52:23 +08:00
lijun 72fe8bdc16 增加项目成本产值管理 2024-12-24 23:41:35 +08:00
lj7788@126.com d7bdc1849f update code 2024-12-24 00:52:38 +08:00
姜玉琦 a58b7b8b03 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2024-12-22 19:56:12 +08:00
姜玉琦 dd887b0496 提交代码 2024-12-22 19:56:04 +08:00
lijun 30fbba6b6b update code 2024-12-22 00:40:50 +08:00
姜玉琦 497177d521 提交代码 2024-12-20 20:25:29 +08:00
姜玉琦 4a80de3acc 提交代码 2024-12-18 22:35:06 +08:00
lijun d563d23b07 update code 2024-12-17 22:57:59 +08:00
姜玉琦 355d94c1b5 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
# Conflicts:
#	yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoSubdeptsUsersService.java
#	yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
2024-12-17 20:27:18 +08:00
姜玉琦 ad0b751737 提交daim 2024-12-17 20:25:30 +08:00
lijun 234f32caad update code 2024-12-14 22:48:31 +08:00
lijun 13c655fa1c update code 2024-12-11 00:21:00 +08:00
lijun 300608c53e update code 2024-12-09 00:25:42 +08:00
lijun 69e2d0cb35 update 增加碳因子管理 2024-12-09 00:08:09 +08:00
lijun c62d6d3cc3 update code 2024-11-16 23:17:24 +08:00
Mac 727c7c414c 修改导入Project 2024-11-09 17:40:37 +08:00
lj7788 6b29ab9a30 增加任务管理 2024-11-09 10:05:00 +08:00
lijun 445908a5e8 update code 2024-10-22 23:22:56 +08:00
lijun 3a494c9bb2 update code 2024-10-22 00:43:37 +08:00
lijun 396c18b2ff update code 2024-10-18 22:16:54 +08:00
lijun 55070225cc update code 2024-10-16 00:24:46 +08:00