Commit Graph

169 Commits (cba2a35f2fb438e06adfaeffd988ee3fd5465172)

Author SHA1 Message Date
姜玉琦 cba2a35f2f 提交代码 2025-01-14 11:34:45 +08:00
姜玉琦 7b08ca2043 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-01-08 00:22:29 +08:00
姜玉琦 785a80f661 提交代码 2025-01-08 00:22:22 +08:00
haha abb4acb456 班组修改 2025-01-07 23:07:35 +08:00
haha 80e68aeae4 在合并 "dev_xd" 和 "origin/dev_xd" 前自动存档 2025-01-07 00:34:41 +08:00
姜玉琦 654d6bf001 提交代码 2025-01-07 00:26:43 +08:00
姜玉琦 0d4b0152d3 提交代码 2025-01-06 23:50:29 +08:00
haha 111be9687a 修改花名册bug 2025-01-06 23:33:36 +08:00
姜玉琦 ffc70cbe29 Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 2025-01-05 23:27:41 +08:00
姜玉琦 757686d4fa 提交代码 2025-01-05 23:27:32 +08:00
haha 1535514b0f 项目详情增加视频切换功能 2025-01-05 22:46:53 +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 964a904cc1 修改后台里程碑管理保存的时候如果实际结束日期没有数据保存的时候会自动填充数据,需要改成不填充 2025-01-02 23:34:45 +08:00
haha 0ab4165788 修改图像不能上传问题 2025-01-02 22:40:43 +08:00
haha cee073cbc7 Merge remote-tracking branch 'origin/dev_xd' into dev_xd 2025-01-02 22:34:19 +08:00
haha 011b937191 update .gitignore 2025-01-02 22:33:40 +08:00
haha 4a39d7507b update .gitignore 2025-01-02 22:30:19 +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
姜玉琦 d07206d57d 提交代码 2024-12-30 23:37:15 +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
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