Commit Graph

138 Commits (69a359ded8078142e48c1a2e6a073a2b1a1ca6e3)

Author SHA1 Message Date
shanao 69a359ded8 修复完所有问题 2024-09-12 14:46:20 +08:00
shanao 2b383e1364 修复导出相关问题 2024-09-10 18:09:40 +08:00
shanao dceba5c4b2 修复导出相关问题 2024-09-10 14:10:42 +08:00
shanao c6ea9844ca 修改图片上传方式为Sftp 导出没有调通 2024-09-09 18:05:42 +08:00
shanao 5197b10d4e 调试 2024-09-08 22:06:08 +08:00
shanao a5b76b25df 优化批量提交 2024-09-06 19:38:32 +08:00
shanao 3e594ab70e 优化批量提交 2024-09-03 17:51:31 +08:00
shanao 7f1a65f3f7 添加注释 2024-09-03 17:08:02 +08:00
shanao eba6660198 上传图片代码 测试用例 2024-09-02 18:07:40 +08:00
shanao cbebfd7150 修改用户名 2024-09-02 16:18:33 +08:00
wangpeng c15fdba0a7 上传 excel 导入 导出 相关代码 2024-09-02 16:11:56 +08:00
wangpeng 70c1ee4c3f 上传事故调查管理代码 2024-08-30 18:07:30 +08:00
wangpeng 73f05b7638 上传事故调查管理代码 2024-08-30 18:04:21 +08:00
zhaoyu 7b9d086d55 Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 2023-12-27 11:12:59 +08:00
zhaoyu 4574316eee 处理海康空指针问题 2023-12-27 11:12:51 +08:00
dearlin 19181555b8 Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
# Conflicts:
#	src/main/resources/application-dev.properties
2023-12-27 10:22:30 +08:00
dearlin 6a7ec92c75 fix: app用户登录时候后台地址问题 2023-12-27 10:21:55 +08:00
guoyuepeng 86765ce3c7 Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 2023-12-26 17:26:51 +08:00
zhaoyu c346cd9d4e Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 2023-12-26 16:57:09 +08:00
zhaoyu 91c3ebdcfc 图片地址 2023-12-26 16:56:49 +08:00
limingyu 5bf53a82a6 修改pc端动火作业动火区域管辖单位显示bug 2023-12-26 16:42:56 +08:00
guoyuepeng 0a7cacc666 测试环境和正式环境的配置信息, 2023-12-26 16:21:52 +08:00
zhaoyu d05156eee2 Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 2023-12-26 16:11:36 +08:00
zhaoyu 42ea8d5208 高处作业迁移补充 2023-12-26 16:11:26 +08:00
guoyuepeng ee37e8e021 Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 2023-12-26 14:02:28 +08:00
liujun a8378f01f0 Merge remote-tracking branch 'origin/liujun-2023-12-18-相关方需求更新' into 1212-八项作业迁移 2023-12-26 13:45:38 +08:00
liujun e1cd46b493 bug修复 2023-12-26 12:35:28 +08:00
guoyuepeng 021a6551a3 动态地址的默认信息 2023-12-26 11:48:51 +08:00
guoyuepeng 7a85418098 Merge pull request '分公司可以创建角色等信息' (#7) from corpSystem into 1212-八项作业迁移
Reviewed-on: #7
2023-12-26 09:54:14 +08:00
liujun 797a8c0586 bug修复 2023-12-25 18:17:09 +08:00
liujun 4f60d4f571 解决无法多选bug 2023-12-25 14:45:17 +08:00
limingyu c8e4eb4972 Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 2023-12-25 14:13:48 +08:00
limingyu 72793b2a76 Merge branch 'lmy20231215-动火bug修改' into 1212-八项作业迁移
# Conflicts:
#	src/main/java/com/zcloud/controller/system/LoginController.java
2023-12-25 13:58:14 +08:00
zhaoyu c82b1a7a01 Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 2023-12-25 13:55:33 +08:00
zhaoyu ce4aafb5af Merge branch 'zy-1218-重点工程播放视频' into 1212-八项作业迁移 2023-12-25 13:55:16 +08:00
dearlin 46b4239571 add: app用户登录时候后台地址问题 2023-12-23 11:36:32 +08:00
liujun 40cbbe7dcc 查看bug修复 2023-12-23 10:27:04 +08:00
liujun 8be39e14d3 查看bug修复 2023-12-22 17:41:36 +08:00
zhaoyu 0e22d45975 增加坐标 2023-12-22 17:09:54 +08:00
liujun 93679092de 查看bug修复 2023-12-22 17:07:44 +08:00
liujun 5d46fa3c4d 查看bug修复 2023-12-22 15:49:12 +08:00
liujun cd048126c0 查看bug修复 2023-12-22 13:39:11 +08:00
zhaoyu 195b9d4de0 处理数据丢失问题 2023-12-22 09:22:58 +08:00
liujun 644ee59398 查看bug修复 2023-12-21 19:55:08 +08:00
zhaoyu 519c0be3e7 注释代码 2023-12-21 17:46:03 +08:00
liujun f59d2b0500 查看bug修复 2023-12-21 16:59:50 +08:00
liujun e552502458 查看bug修复 2023-12-21 15:15:45 +08:00
liujun a28d97cea7 相关方查看详情统一格式 2023-12-21 13:58:57 +08:00
liujun 9e7a5334bd bug修复 2023-12-20 19:51:15 +08:00
liujun 8c68daee79 bug修复 2023-12-20 15:57:29 +08:00