Commit Graph

204 Commits (8c578aa707e772b705a853932a376746cbdd8c07)

Author SHA1 Message Date
姜玉琦 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
姜玉琦 75953e6c1f 提交代码 2025-03-09 15:12:11 +08:00
姜玉琦 c968a009b3 提交代码 2025-03-08 16:54:27 +08:00
姜玉琦 f598a52789 提交代码 2025-03-08 16:25:28 +08:00
姜玉琦 4635d42aa4 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/controller/SmzSspProblemmodifyController.java
#	yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/ISmzSspProblemmodifyService.java
2025-03-08 16:18:15 +08:00
姜玉琦 bb93a26ed0 提交代码 2025-03-08 16:14:09 +08:00
lj7788@126.com dea174ab73 安全隐患大屏后台 2025-03-08 15:39:41 +08:00
姜玉琦 082acc5ce8 提交代码 2025-03-08 02:01:13 +08:00
姜玉琦 20986f1a1f 提交代碼 2025-03-06 22:36:43 +08:00
姜玉琦 f3735dbced Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-03-05 23:22:27 +08:00
姜玉琦 7820a68145 提交代码 2025-03-05 23:22:18 +08:00
haha 9a41479bec 安全隐患整改审批流程处理 2025-03-05 23:20:06 +08:00
haha 411a84e564 更新安全隐患排查-审批流程 2025-03-05 00:14:39 +08:00
haha be9e392ec7 安全隐患详情开发 2025-03-04 00:08:06 +08:00
haha 2536e68a0d 安全隐患整改列表处理 2025-03-02 23:21:59 +08:00
姜玉琦 f32f647c11 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-03-02 11:34:53 +08:00
姜玉琦 bf1d2ce0a7 提交代码 2025-03-02 11:34:35 +08:00
haha c093e4dd91 安全隐患整改列表 2025-03-01 16:11:25 +08:00
haha 6491e9d05d 安全隐患列表 2025-03-01 00:06:15 +08:00
姜玉琦 e1a8ab5ade 提交代码 2025-02-28 21:42:59 +08:00
haha bc4d6e14ca 安全隐患功能 2025-02-28 00:27:10 +08:00
姜玉琦 2fbf85a62b 提交代码 2025-02-27 00:16:03 +08:00
姜玉琦 5fb316b69f 提交代码 2025-02-23 22:38:45 +08:00
姜玉琦 4c189dd5a4 提交代码 2025-02-23 22:08:16 +08:00
姜玉琦 76d3f1513b 提交代码 2025-02-22 18:09:51 +08:00
姜玉琦 98abe2de96 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-02-22 11:19:53 +08:00
姜玉琦 4cbac781bd 提交代码 2025-02-22 11:19:45 +08:00
haha c9fb9f9f56 系统用户界面增加身份证上传 2025-02-21 23:55:45 +08:00
姜玉琦 6703fc0bd1 提交代码 2025-02-21 00:44:49 +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
姜玉琦 d4fb05d7d1 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-02-16 10:30:28 +08:00
姜玉琦 20f9f2864d 提交代码 2025-02-16 10:30:18 +08:00
lj7788@126.com 5b28d1cbea 隐患管理后台代码-生成器 2025-02-15 16:52:57 +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
haha e4479a11ad 修改绿能的导入和导出功能 2025-02-11 23:08:06 +08:00
haha 53193f94bb 修改人员花名册 2025-02-11 22:30:06 +08:00
姜玉琦 acb89e5bc1 提交代码 2025-02-09 23:21:48 +08:00
haha 049a04bcc7 人员表中增加人员岗位 2025-02-09 21:56:02 +08:00
haha 24f70b0efb Merge remote-tracking branch 'origin/dev_xd' into dev_xd 2025-02-05 22:05:04 +08:00
haha 3d0597c252 修改用户查询,增加com_name 2025-02-05 22:05:00 +08:00
姜玉琦 72ff6d6f49 提交代码 2025-02-05 21:56:28 +08:00
姜玉琦 d45a66a2fe 提交代码 2025-02-05 21:34:43 +08:00
姜玉琦 a278edbd29 提交代码 2025-01-22 00:21:04 +08:00
姜玉琦 f04e7b191b 提交代码 2025-01-19 00:59:58 +08:00
haha 4176ed29fc 修改用户列表查询 2025-01-17 22:59:11 +08:00
姜玉琦 4dde6b7b36 提交代码 2025-01-15 00:49:37 +08:00
haha f91232d0e0 修改用户管理界面 2025-01-13 23:59:24 +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
lj7788@126.com 9490d7aa7c 修改查询命令 2025-01-09 14:16:11 +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
姜玉琦 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 964a904cc1 修改后台里程碑管理保存的时候如果实际结束日期没有数据保存的时候会自动填充数据,需要改成不填充 2025-01-02 23:34:45 +08:00
haha 011b937191 update .gitignore 2025-01-02 22:33:40 +08:00
姜玉琦 d07206d57d 提交代码 2024-12-30 23:37:15 +08:00
姜玉琦 eaa5ad1167 提交代码 2024-12-30 23:08:35 +08:00
姜玉琦 f8ebc6679b 提交代码 2024-12-30 00:31:06 +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 685a6db03e update code 2024-12-05 00:17:06 +08:00
lijun c6596db86c update code 2024-11-28 23:59:43 +08:00
lijun 8ed1dd28e1 增加大屏项目 2024-11-27 23:42:39 +08:00
lj7788 6b29ab9a30 增加任务管理 2024-11-09 10:05:00 +08:00
lijun 445908a5e8 update code 2024-10-22 23:22:56 +08:00