Commit Graph

105 Commits (2bd827b5d24b592ea50cc33861781a5b56cfe29f)

Author SHA1 Message Date
姜玉琦 2bd827b5d2 提交代码 2025-01-05 14:50:51 +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