Commit Graph

238 Commits (b44bfe838c65a9ebc192ad03f7b58f1f83204c42)

Author SHA1 Message Date
姜玉琦 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
haha f312a55d7d Merge remote-tracking branch 'origin/dev_xd' into dev_xd 2024-12-29 22:11:01 +08:00
haha 0b7801b302 视频监控大屏 2024-12-29 22:10:36 +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 d7bdc1849f update code 2024-12-24 00:52:38 +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
lijun 46650c7b71 update code 2024-12-21 12:53:39 +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 3346e22d2f update code 2024-12-15 23:38:24 +08:00
lijun 234f32caad update code 2024-12-14 22:48:31 +08:00
lijun 05c15aeb9a update code 2024-12-13 22:06:04 +08:00
lijun 1723b7d0ac update code 2024-12-12 00:29:01 +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 732c9c705f update code 2024-12-05 23:19:07 +08:00
lijun 4bd4b8eb20 update code 2024-12-05 23:18:31 +08:00
lijun 685a6db03e update code 2024-12-05 00:17:06 +08:00
lijun f3790e1b68 update code 2024-12-02 00:05:10 +08:00
lijun 692c601235 update code 2024-11-30 00:13:31 +08:00
lijun 909bc281a9 update code 2024-11-29 23:08:39 +08:00
lijun c6596db86c update code 2024-11-28 23:59:43 +08:00
lijun 8ed1dd28e1 增加大屏项目 2024-11-27 23:42:39 +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
姜玉琦 a2ad6bce52 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2024-11-02 11:07:32 +08:00
姜玉琦 6de8e3c413 提交代码 2024-11-02 11:07:14 +08:00
lijun 445908a5e8 update code 2024-10-22 23:22:56 +08:00
lijun 73df61a0a0 update 2024-10-22 01:02:50 +08:00