 dearlin
|
b05da152b8
|
图片传输
|
2023-12-20 17:16:37 +08:00 |
z
|
a64ca447ed
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-20 17:11:09 +08:00 |
|
z
|
65b2c2fa5c
|
重点工程部分代码
|
2023-12-20 17:10:38 +08:00 |
 liujun
|
8c68daee79
|
bug修复
|
2023-12-20 15:57:29 +08:00 |
limingyu
|
d44ba70a52
|
沧州矿石数据对接有限空间作业
|
2023-12-20 15:25:17 +08:00 |
|
liujun
|
add025a274
|
bug修复
|
2023-12-20 15:01:47 +08:00 |
|
liujun
|
d8f38ffdcd
|
bug修复
|
2023-12-20 14:49:01 +08:00 |
|
z
|
ed8f04b79d
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
# Conflicts:
# src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java
|
2023-12-20 11:26:18 +08:00 |
|
z
|
491d640c87
|
重点工程部分代码
|
2023-12-20 11:13:51 +08:00 |
|
dearlin
|
60ea9c4d6a
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
# Conflicts:
# src/main/java/com/zcloud/aspect/DockingAspect.java
|
2023-12-20 11:08:59 +08:00 |
|
dearlin
|
f0cfa0e9cc
|
数据同步aop改造
|
2023-12-20 11:08:33 +08:00 |
|
z
|
a8b7161202
|
重点工程部分代码
|
2023-12-20 09:18:51 +08:00 |
|
liujun
|
7360ba8cca
|
bug修复
|
2023-12-19 20:03:25 +08:00 |
|
limingyu
|
990ea8814d
|
修改动火作业数据延时监火审核人显示
|
2023-12-19 18:00:49 +08:00 |
|
z
|
04b47140a9
|
重点工程部分代码
|
2023-12-19 17:59:12 +08:00 |
|
z
|
554cba29f1
|
重点工程部分代码
|
2023-12-19 17:53:04 +08:00 |
|
z
|
88c2a8fdeb
|
重点工程部分代码
|
2023-12-19 17:52:09 +08:00 |
|
z
|
ef780ecd83
|
重点工程部分代码
|
2023-12-19 17:34:17 +08:00 |
 songwenxuan
|
3b1afc8344
|
清单排查、隐患流程对接代码
|
2023-12-19 17:28:02 +08:00 |
|
z
|
3aa8b0d9af
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-19 17:27:26 +08:00 |
|
z
|
e74db7d77c
|
重点工程部分代码
|
2023-12-19 17:27:01 +08:00 |
|
dearlin
|
9843400cb3
|
合并线上代码
|
2023-12-19 17:24:27 +08:00 |
|
dearlin
|
7ca4ab9570
|
Merge branch '1212-八项作业迁移' into czks1.0
# Conflicts:
# pom.xml
# src/main/resources/application-dev.properties
# src/main/resources/application-master.properties
|
2023-12-19 17:18:35 +08:00 |
|
z
|
745db61979
|
重点工程部分代码
|
2023-12-19 17:16:00 +08:00 |
|
dearlin
|
ab8937ed18
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-19 17:14:28 +08:00 |
|
dearlin
|
b0b3c1b2eb
|
库名不对
|
2023-12-19 17:14:02 +08:00 |
|
liujun
|
d50f6f2d28
|
八项作业前端更新
|
2023-12-19 17:12:17 +08:00 |
|
z
|
45da519a19
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-19 17:07:24 +08:00 |
|
z
|
0679647cfd
|
重点工程部分代码
|
2023-12-19 17:06:28 +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 |
|
dearlin
|
ac77a1bbff
|
Merge branch 'czks1.0' of http://47.92.113.182:3000/guoyuepeng/qa-prevention-gwj into guoyuepeng-czks1.0
|
2023-12-19 15:57:27 +08:00 |
|
dearlin
|
fbc6be15c1
|
企业系统管理
|
2023-12-19 15:55:25 +08:00 |
|
dearlin
|
54dffe99ab
|
合并重点工程
|
2023-12-19 15:46:18 +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 |
|
dearlin
|
b05a521997
|
企业系统管理
|
2023-12-19 11:33:26 +08:00 |
zhaoyu
|
07b7e772aa
|
列表拆分 并且app播放视频
|
2023-12-19 11:33:21 +08:00 |
|
dearlin
|
97a5df06f6
|
Merge remote-tracking branch 'origin/corpSystem' into czks1.0
# Conflicts:
# src/main/resources/application-dev.properties
|
2023-12-19 11:20:23 +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 |
|
limingyu
|
f291775fd1
|
APP不获取用户信息
|
2023-12-18 18:17:51 +08:00 |
|
songwenxuan
|
6de19888a1
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-18 16:58:26 +08:00 |
|
songwenxuan
|
ca39da851b
|
代码恢复
|
2023-12-18 16:58:08 +08:00 |
|
dearlin
|
062f77fa00
|
附件上传
|
2023-12-18 16:14:27 +08:00 |
|
zhaoyu
|
63d831eba9
|
增加角标
|
2023-12-18 14:23:18 +08:00 |
|
dearlin
|
b4c3061e84
|
沧州矿石项目修改
|
2023-12-18 10:45:21 +08:00 |
|
dearlin
|
f5f2863195
|
沧州矿石项目修改
|
2023-12-18 10:43:38 +08:00 |
|
dearlin
|
52a099149d
|
沧州矿石项目修改
|
2023-12-18 10:39:16 +08:00 |
|
zhaoyu
|
d59a9f1dfe
|
重点工程列表排序
|
2023-12-18 10:25:17 +08:00 |