 wangxuan
|
0e1e91eb28
|
Merge branch '1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-25 14:34:53 +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 |
|
dearlin
|
2bdacb3f08
|
Merge branch 'guoyuepeng-1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-22 09:09:20 +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 |
|
liujun
|
add025a274
|
bug修复
|
2023-12-20 15:01:47 +08:00 |
|
liujun
|
d8f38ffdcd
|
bug修复
|
2023-12-20 14:49:01 +08:00 |
|
liujun
|
7360ba8cca
|
bug修复
|
2023-12-19 20:03:25 +08:00 |
|
limingyu
|
990ea8814d
|
修改动火作业数据延时监火审核人显示
|
2023-12-19 18:00:49 +08:00 |
|
liujun
|
d50f6f2d28
|
八项作业前端更新
|
2023-12-19 17:12:17 +08:00 |
|
liujun
|
a87827104e
|
Merge branch 'dev' into 1212-八项作业迁移
# Conflicts:
# pom.xml
# src/main/resources/application-dev.properties
|
2023-12-19 16:45:15 +08:00 |
|
liujun
|
d5f729cdbe
|
bug修复
|
2023-12-19 15:01:44 +08:00 |
|
limingyu
|
e29300756e
|
Merge branch 'dev' into lmy20231215-动火bug修改
|
2023-12-19 14:15:35 +08:00 |
|
zhaoyu
|
07b7e772aa
|
列表拆分 并且app播放视频
|
2023-12-19 11:33:21 +08:00 |
|
liujun
|
6d49773242
|
相关方需求变革
|
2023-12-18 20:24:02 +08:00 |
|
liujun
|
cfb4c2dd8e
|
相关方需求变革
|
2023-12-18 19:58:52 +08:00 |
|
liujun
|
a0dcdb61d3
|
相关方需求变革
|
2023-12-18 18:54:50 +08:00 |
|
zhaoyu
|
63d831eba9
|
增加角标
|
2023-12-18 14:23:18 +08:00 |
|
zhaoyu
|
d59a9f1dfe
|
重点工程列表排序
|
2023-12-18 10:25:17 +08:00 |
|
zhaoyu
|
6cb9900bbf
|
增加31的mq配置
|
2023-12-18 09:36:47 +08:00 |
|
zhaoyu
|
0d9228dda4
|
八项作业优化 正向流程bug修复
|
2023-12-17 15:53:55 +08:00 |
|
zhaoyu
|
343b66b914
|
正向逻辑走通
|
2023-12-17 14:18:12 +08:00 |
|
zhaoyu
|
fcd6a6860f
|
高处作业迁移补充
|
2023-12-17 09:31:34 +08:00 |
|
limingyu
|
6997c26a5f
|
一公司企业端驾驶舱危险作业统计显示2
|
2023-12-15 15:09:16 +08:00 |
|
limingyu
|
83c43d21f2
|
Merge branch 'lmy20231207-登录返回图片和后端地址' into lmy20231215-动火bug修改
|
2023-12-15 14:11:14 +08:00 |
|
limingyu
|
4a347f328a
|
Merge branch 'lmy20231211' into lmy20231215-动火bug修改
|
2023-12-15 14:05:10 +08:00 |
|
limingyu
|
6937054d44
|
一公司企业端驾驶舱危险作业统计显示
|
2023-12-15 13:59:11 +08:00 |
|
zhaoyu
|
1cb56a5c82
|
正式配置修改
|
2023-12-14 19:42:21 +08:00 |
|
zhaoyu
|
a63fd74460
|
Merge remote-tracking branch 'origin/lmy20231113' into 相关方关联分公司功能
|
2023-12-14 19:33:34 +08:00 |
guoyuepeng
|
88be88ad31
|
正式地址配置信息
|
2023-12-14 19:32:32 +08:00 |
|
zhaoyu
|
c972e6c9c7
|
Merge remote-tracking branch 'origin/lmy20231211' into 相关方关联分公司功能
|
2023-12-14 18:48:24 +08:00 |
|
limingyu
|
f53539025c
|
延时监火改为多人同时监火，在同一个部门中都可以查看和发布监火信息2
|
2023-12-14 18:40:07 +08:00 |
|
zhaoyu
|
190f0dc838
|
Merge remote-tracking branch 'origin/相关方关联分公司功能' into 相关方关联分公司功能
|
2023-12-14 17:23:51 +08:00 |
|
zhaoyu
|
8446811b6f
|
搜索bug处理
|
2023-12-14 17:23:42 +08:00 |