z
|
88c2a8fdeb
|
重点工程部分代码
|
2023-12-19 17:52:09 +08:00 |
|
z
|
ef780ecd83
|
重点工程部分代码
|
2023-12-19 17:34:17 +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 |
|
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 |
|
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 |
|
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 |
|
dearlin
|
b05a521997
|
企业系统管理
|
2023-12-19 11:33:26 +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 |
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 |
|
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
|
6cb9900bbf
|
增加31的mq配置
|
2023-12-18 09:36:47 +08:00 |
|
zhaoyu
|
0d9228dda4
|
八项作业优化 正向流程bug修复
|
2023-12-17 15:53:55 +08:00 |
|
dearlin
|
331e779e11
|
add: 数据同步相关aop功能迁移
|
2023-12-17 15:48:56 +08:00 |
|
dearlin
|
9757d08f69
|
数据同步相关代码
|
2023-12-17 15:44:38 +08:00 |
|
dearlin
|
7073565e0b
|
add: 沧州矿石代码同步加地图版本
|
2023-12-17 15:29:45 +08:00 |
|
zhaoyu
|
343b66b914
|
正向逻辑走通
|
2023-12-17 14:18:12 +08:00 |
|
zhaoyu
|
fcd6a6860f
|
高处作业迁移补充
|
2023-12-17 09:31:34 +08:00 |
 liujun
|
71e3449f48
|
12618 编辑页面 判空提示语不正确
|
2023-12-14 16:50:11 +08:00 |
|
liujun
|
09b8516881
|
八项作业前端更新
|
2023-12-14 14:47:02 +08:00 |
|
zhaoyu
|
253f559ba5
|
是否发送短信字段
|
2023-12-14 09:52:05 +08:00 |
|
zhaoyu
|
9469e9c1db
|
Merge remote-tracking branch 'origin/相关方关联分公司功能' into 相关方关联分公司功能
|
2023-12-13 14:45:23 +08:00 |
|
zhaoyu
|
cfc13f4ae0
|
企业端缺失功能补全
|
2023-12-13 14:45:11 +08:00 |
|
liujun
|
d55fd86916
|
八项作业前端更新
|
2023-12-13 14:35:16 +08:00 |
|
liujun
|
e3b7a14601
|
吊装作业
|
2023-12-13 13:49:37 +08:00 |
|
liujun
|
e21a116d8d
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-13 13:02:45 +08:00 |
|
liujun
|
8e983a58a8
|
短路功能迁移
|
2023-12-13 13:02:20 +08:00 |
|
zhaoyu
|
dfa04334c3
|
临时用电迁移
|
2023-12-13 10:58:39 +08:00 |
|
liujun
|
515476f56a
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-13 10:14:20 +08:00 |
|
liujun
|
520d5a03c6
|
短路功能迁移
|
2023-12-13 10:14:00 +08:00 |
|
zhaoyu
|
7f3883c401
|
临时用电 暂时提交 报错未解决
|
2023-12-13 09:18:54 +08:00 |
|
liujun
|
c998e2ebb0
|
bug修复
|
2023-12-12 19:16:04 +08:00 |
|
liujun
|
cce02a4d42
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-12 18:02:47 +08:00 |
|
liujun
|
1daf485e92
|
八项作业mq功能
|
2023-12-12 18:02:22 +08:00 |
|
zhaoyu
|
e9fccd58fc
|
有限空间迁移 还缺少mq 等内容
|
2023-12-12 17:47:59 +08:00 |
|
zhaoyu
|
f338b750da
|
动土作业迁移
|
2023-12-12 15:25:59 +08:00 |
|
zhaoyu
|
486a95acdb
|
盲板作业迁移
|
2023-12-12 13:46:12 +08:00 |
|
zhaoyu
|
2521ccf737
|
部署31专用配置文件
|
2023-12-12 10:24:05 +08:00 |
|
zhaoyu
|
e0d63a1bcb
|
部署31配置文件修改
|
2023-12-12 10:23:44 +08:00 |