Commit Graph

186 Commits (c968a009b3083f0cd1666c0935072f97e8f46a06)

Author SHA1 Message Date
haha 049a04bcc7 人员表中增加人员岗位 2025-02-09 21:56:02 +08:00
姜玉琦 ee3ac9904a 提交 2025-02-08 00:21:43 +08:00
姜玉琦 674595d683 提交 2025-02-05 23:44:23 +08:00
姜玉琦 72ff6d6f49 提交代码 2025-02-05 21:56:28 +08:00
姜玉琦 d45a66a2fe 提交代码 2025-02-05 21:34:43 +08:00
lj7788@126.com 5a19e81931 修改考勤参数 2025-01-25 14:37:50 +08:00
lj7788@126.com af69e57c4f 修改考勤的保存功能 2025-01-25 13:03:47 +08:00
haha a8853781c4 增加身份证识别功能 2025-01-24 00:12:27 +08:00
姜玉琦 a278edbd29 提交代码 2025-01-22 00:21:04 +08:00
haha c7162b09ce 修改花名册的同步 2025-01-21 23:52:57 +08:00
姜玉琦 f04e7b191b 提交代码 2025-01-19 00:59:58 +08:00
姜玉琦 45af87f1f6 提交代码 2025-01-15 23:17:01 +08:00
姜玉琦 4dde6b7b36 提交代码 2025-01-15 00:49:37 +08:00
haha 5be1fdd66a 修改用户增加功能 2025-01-15 00:26:09 +08:00
haha 55dc571444 修改用户注册 2025-01-14 23:05:07 +08:00
姜玉琦 946004d476 提交代码 2025-01-14 22:59:52 +08:00
haha f91232d0e0 修改用户管理界面 2025-01-13 23:59:24 +08:00
lj7788@126.com e40e1092e5 修改管理员激活项目 2025-01-11 20:31:06 +08:00
lj7788@126.com 3d7ce9ea79 修改多租户功能 2025-01-11 17:14:40 +08:00
lj7788@126.com 1492f4ce31 修改多租户功能 2025-01-11 12:39:47 +08:00
lj7788@126.com a408dec2ef 修改多租户 2025-01-10 17:45:27 +08:00
lj7788@126.com e892f77673 系统用户改造 2025-01-09 22:20: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
姜玉琦 757686d4fa 提交代码 2025-01-05 23:27:32 +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
姜玉琦 c5c077d1cb 提交代码 2025-01-04 19:16:21 +08:00
姜玉琦 5d0e06bc7b 1 2025-01-04 19:07:41 +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 011b937191 update .gitignore 2025-01-02 22:33:40 +08:00
haha 044fd616b1 Revert "Auxiliary commit to revert individual files from 6235eaf1ec66255731d32b57ae06d81b37593030"
This reverts commit 5c9cc4c94d570cce4146f82df5f847458d3b7ca6.
2025-01-02 22:23:31 +08:00
haha 6235eaf1ec 修改上传文件名,处理文件名 2025-01-02 22:17:00 +08:00
姜玉琦 a1f7d8df78 提交代码 2024-12-30 23:41:40 +08:00
姜玉琦 a3d00eac91 提交代码 2024-12-30 23:31:50 +08:00
姜玉琦 eaa5ad1167 提交代码 2024-12-30 23:08:35 +08:00
姜玉琦 b02c67b7a3 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2024-12-30 00:31:13 +08:00
姜玉琦 f8ebc6679b 提交代码 2024-12-30 00:31:06 +08:00
haha 467e9755fc 视频监控大屏 2024-12-29 23:00:20 +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
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 8c38750b3b 增加mac 2024-12-24 00:04:30 +08:00
姜玉琦 659f828a27 提交代码 2024-12-22 20:05:33 +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
姜玉琦 26a1acb114 提交代码 2024-12-18 22:38:11 +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
姜玉琦 7c8e5aac33 提交代码 2024-12-17 20:31:18 +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 69e2d0cb35 update 增加碳因子管理 2024-12-09 00:08:09 +08:00
lijun d641a73d5e update code 2024-12-07 12:49:34 +08:00
lijun 685a6db03e update code 2024-12-05 00:17:06 +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 dcd93473ed update code 2024-10-22 01:00:40 +08:00
lijun 3a494c9bb2 update code 2024-10-22 00:43:37 +08:00
lijun a0094c618a update code 2024-10-19 23:53:44 +08:00
lijun 396c18b2ff update code 2024-10-18 22:16:54 +08:00
姜玉琦 725f4290c1 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2024-10-15 23:55:21 +08:00
姜玉琦 d39ec4c92f 提交代码 2024-10-15 23:55:13 +08:00
lijun ec14b0557b update code 2024-10-15 23:22:33 +08:00
姜玉琦 181d2e9d53 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2024-10-15 00:33:26 +08:00
姜玉琦 48dda158ad 提交代码 2024-10-15 00:32:34 +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
姜玉琦 a0a14975af 提交 2024-10-13 16:20:02 +08:00
姜玉琦 5c1e1e427b 提交代码 2024-10-13 16:17:49 +08:00
姜玉琦 ea52f8e363 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2024-10-13 15:40:39 +08:00
姜玉琦 4e2416fee1 提交代码 2024-10-13 15:40:28 +08:00
lijun 806f1fe08f Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2024-10-13 15:10:40 +08:00
lijun 098dda6c65 update code 2024-10-13 15:10:30 +08:00
姜玉琦 17ae99df01 提交代码 2024-10-13 13:22:00 +08:00
lijun 3fe8f4c6c3 update code 2024-10-13 11:26:52 +08:00
姜玉琦 62b7274548 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2024-10-13 11:26:34 +08:00
姜玉琦 0811adc4a9 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
# Conflicts:
#	yanzhu-modules/yanzhu-manage/pom.xml
2024-10-13 11:26:27 +08:00
姜玉琦 3535b0d6a8 提交代码 2024-10-13 11:25:16 +08:00
lijun 1cf74add92 upate code 2024-10-13 00:15:53 +08:00
lijun 953f85ffc8 update code 2024-10-11 00:29:35 +08:00
lijun 7fcd920b52 update code 2024-10-10 00:34:39 +08:00
lijun 88c5960665 update code 2024-10-08 23:39:19 +08:00