Commit Graph

116 Commits (61c7075d4c89ce7accc2d2c4c93f3e4df1fa7c66)

Author SHA1 Message Date
songwenxuan 61c7075d4c 消防安全管理对接代码 2023-12-22 08:42:44 +08:00
songwenxuan 4568e46388 消防安全管理对接代码 2023-12-22 08:42:29 +08:00
songwenxuan 3a1fba8604 清单排查、隐患流程对接代码 2023-12-21 14:32:23 +08:00
dearlin e4a311fdb2 消防资源 2023-12-21 14:18:19 +08:00
songwenxuan 5503a64b6d Merge remote-tracking branch 'origin/czks1.0' into czks1.0 2023-12-21 10:05:01 +08:00
songwenxuan a34a946c0a 清单排查、隐患流程对接代码 2023-12-21 10:04:48 +08:00
dearlin 15101b57fd 图片传输 2023-12-21 08:56:30 +08:00
songwenxuan 46d4a3a623 Merge remote-tracking branch 'origin/czks1.0' into czks1.0 2023-12-21 08:32:05 +08:00
songwenxuan 336916d4b9 清单排查、隐患流程对接代码 2023-12-21 08:28:37 +08:00
z 50b21cd9d9 Merge remote-tracking branch 'origin/czks1.0' into czks1.0 2023-12-20 17:35:38 +08:00
z bb2381b7b2 重点工程部分代码 2023-12-20 17:35:26 +08:00
dearlin 1e86cd08b9 Merge remote-tracking branch 'origin/czks1.0' into czks1.0 2023-12-20 17:16:48 +08:00
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
limingyu d44ba70a52 沧州矿石数据对接有限空间作业 2023-12-20 15:25:17 +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
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
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