Commit Graph

178 Commits (c2e101fa10d5e81a73ff03d078325f1ee63414f1)

Author SHA1 Message Date
lj7788@126.com 5316655572 第三方考勤人员管理功能开发 2025-06-23 16:17:44 +08:00
lj7788@126.com 64e18f1e89 开发BIM交底功能 2025-06-23 12:04:37 +08:00
lj7788@126.com f19dc47e8f 修改项目详情信息 2025-06-21 16:18:49 +08:00
姜玉琦 5724ba1ea9 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-06-20 21:08:03 +08:00
姜玉琦 813724b53f 提交代码 2025-06-20 21:07:54 +08:00
lj7788@126.com efca395775 修改花名册增加人员时userid为空 2025-06-20 14:21:36 +08:00
lj7788@126.com 749aaa7b28 大屏菜单定制化 2025-06-17 16:21:08 +08:00
haha 9e3205060a 修改大屏劳务管理 2025-06-01 21:13:55 +08:00
haha 5f48623204 劳务管理大屏 2025-05-23 00:08:04 +08:00
haha 95d37fab45 劳务管理大屏 2025-05-21 00:47:25 +08:00
姜玉琦 06ceddbd15 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-05-20 19:49:37 +08:00
姜玉琦 8c578aa707 提交代码 2025-05-20 19:49:27 +08:00
haha 0205552d92 劳务管理后台开发 2025-05-19 00:12:03 +08:00
姜玉琦 2a6abb3ad2 提交代码 2025-05-18 10:49:44 +08:00
haha b9958ebdb1 更新大屏 2025-05-14 23:49:00 +08:00
haha 082e35f9c5 修复问题 2025-05-13 01:06:27 +08:00
姜玉琦 7d14cda64c Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-05-09 22:25:56 +08:00
姜玉琦 93c5730c4c 提交代码 2025-05-09 22:25:45 +08:00
haha e26c79cf23 大屏考勤兼容处理 2025-05-08 00:21:11 +08:00
姜玉琦 5c6158377e 提交代码 2025-05-07 22:18:18 +08:00
姜玉琦 9155b554da 提交代码 2025-05-07 01:08:13 +08:00
姜玉琦 ea16bd847c Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-05-07 00:38:20 +08:00
姜玉琦 7c416e34ee 提交代码 2025-05-07 00:38:09 +08:00
haha 8a01cf3856 修改济工网考勤系统 2025-05-05 20:12:53 +08:00
姜玉琦 d9a0c5b99e Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-04-29 00:39:41 +08:00
姜玉琦 3b3784aa37 提交代码 2025-04-29 00:39:32 +08:00
haha b29e602186 考勤系统迁移 2025-04-29 00:00:22 +08:00
姜玉琦 f6cc1ecbf8 提交代码 2025-04-28 00:41:03 +08:00
姜玉琦 3604154c1c 提交代码 2025-04-27 01:52:47 +08:00
姜玉琦 e23d807e0f 提交代码 2025-04-20 13:32:10 +08:00
姜玉琦 5a580280a7 提交代码 2025-03-30 22:04:15 +08:00
姜玉琦 3699296e63 提交代码 2025-03-23 00:15:33 +08:00
姜玉琦 8add9bb887 提交代码 2025-03-22 18:49:00 +08:00
姜玉琦 e2dd163efc 提交代码 2025-03-20 00:53:20 +08:00
姜玉琦 b26778ca05 提交 2025-03-14 00:15:16 +08:00
姜玉琦 c0dbc27d5f 提交代码 2025-03-11 17:03:26 +08:00
姜玉琦 d2b8ce4b2c 提交代码 2025-03-10 00:01:08 +08:00
姜玉琦 e5653b4c56 提交 2025-03-09 21:17:00 +08:00
姜玉琦 10f6cad6cb 提交代码 2025-03-09 15:43:29 +08:00
姜玉琦 c968a009b3 提交代码 2025-03-08 16:54:27 +08:00
姜玉琦 7820a68145 提交代码 2025-03-05 23:22:18 +08:00
姜玉琦 bf1d2ce0a7 提交代码 2025-03-02 11:34:35 +08:00
姜玉琦 e1a8ab5ade 提交代码 2025-02-28 21:42:59 +08:00
姜玉琦 2fbf85a62b 提交代码 2025-02-27 00:16:03 +08:00
姜玉琦 76d3f1513b 提交代码 2025-02-22 18:09:51 +08:00
姜玉琦 b44bfe838c 提交代码 2025-02-19 22:22:47 +08:00
姜玉琦 8d889e30ea 提交代码 2025-02-17 00:10:27 +08:00
姜玉琦 c9104c62e3 提交代码 2025-02-16 17:20:25 +08:00
姜玉琦 20f9f2864d 提交代码 2025-02-16 10:30:18 +08:00
姜玉琦 849401501a 提交 2025-02-15 14:58:31 +08:00
姜玉琦 a5f0802170 提交 2025-02-15 14:20:56 +08:00
姜玉琦 1c6c543523 提交代码 2025-02-13 00:20:27 +08:00
姜玉琦 acb89e5bc1 提交代码 2025-02-09 23:21:48 +08:00
haha 049a04bcc7 人员表中增加人员岗位 2025-02-09 21:56:02 +08:00
haha 3d0597c252 修改用户查询,增加com_name 2025-02-05 22:05:00 +08:00
姜玉琦 d45a66a2fe 提交代码 2025-02-05 21:34:43 +08:00
姜玉琦 a278edbd29 提交代码 2025-01-22 00:21:04 +08:00
lj7788@126.com 3d7ce9ea79 修改多租户功能 2025-01-11 17:14:40 +08:00
haha 72cf2d257c update 2025-01-09 12:16:22 +08:00
haha af4cfe9ff8 修改人员增加 2025-01-08 00:24:03 +08:00
姜玉琦 654d6bf001 提交代码 2025-01-07 00:26:43 +08:00
姜玉琦 0d4b0152d3 提交代码 2025-01-06 23:50:29 +08:00
姜玉琦 6cdfdf8da9 提交代码 2025-01-05 17:09:19 +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
姜玉琦 c5c077d1cb 提交代码 2025-01-04 19:16:21 +08:00
姜玉琦 44a2e7fb34 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
# Conflicts:
#	yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml
2025-01-04 18:25:06 +08:00
姜玉琦 355f842d06 提交代码 2025-01-04 18:20:57 +08:00
haha 552f768190 大屏问题处理 2025-01-04 00:53:16 +08:00
haha 964a904cc1 修改后台里程碑管理保存的时候如果实际结束日期没有数据保存的时候会自动填充数据,需要改成不填充 2025-01-02 23:34:45 +08:00
haha 011b937191 update .gitignore 2025-01-02 22:33:40 +08:00
姜玉琦 7dbe6f0e68 提交代码 2024-12-29 21:36:44 +08:00
姜玉琦 70f43b3973 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2024-12-29 11:48:09 +08:00
姜玉琦 8877bef239 提交代码 2024-12-29 11:47:59 +08:00
lijun 9d75715d31 add videoMonitor 2024-12-28 09:52:23 +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
姜玉琦 b0ba39d781 提交代码 2024-12-17 22:36:07 +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 d641a73d5e update code 2024-12-07 12:49:34 +08:00
lijun c6596db86c update code 2024-11-28 23:59:43 +08:00
lj7788 6b29ab9a30 增加任务管理 2024-11-09 10:05:00 +08:00
lijun 396c18b2ff update code 2024-10-18 22:16:54 +08:00
lijun ec14b0557b update code 2024-10-15 23:22:33 +08:00
lijun df400f758b update code 2024-10-14 00:01:52 +08:00
lijun 23ad592b40 update code 2024-10-13 23:18:53 +08:00
lijun 098dda6c65 update code 2024-10-13 15:10:30 +08:00
lijun 3fe8f4c6c3 update code 2024-10-13 11:26:52 +08:00
lijun 1cf74add92 upate code 2024-10-13 00:15:53 +08:00
lijun 7fcd920b52 update code 2024-10-10 00:34:39 +08:00