guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity
311 Commits
29 Branches
4 Tags
151 MiB
Commit Graph

311 Commits (095be8743dbf24ed27e7647b7f2f35f6b5b9de2d)

Author SHA1 Message Date
dearlin d4d4de3185 平台视频，电子围栏，围栏报警。 2024-01-08 14:55:15 +08:00
zhaoyu bfd9ee0928 重点工程附件没名称问题 2024-01-08 09:18:55 +08:00
dearlin df3a0b5d76 Merge branch 'czks1.0' of http://47.92.113.182:3000/czks/qa-prevention-czks-b into czks1.0 2024-01-08 09:16:38 +08:00
dearlin 3fe3d5e010 人员定位 2024-01-08 09:16:25 +08:00
zhaoyu 7e2b6b468d 沧州同步到港务局接口增加 2024-01-06 18:16:25 +08:00
zhaoyu 7405fd91b7 111 2024-01-06 18:10:11 +08:00
songwenxuan 73983d5e0a Merge remote-tracking branch 'origin/czks1.0' into czks1.0 2024-01-06 18:01:42 +08:00
songwenxuan 48d3783665 pc端对接问题修复 2024-01-06 18:01:18 +08:00
dearlin 6fef2c1407 沧州矿石数据同步日志 2024-01-06 15:24:03 +08:00
dearlin 12d0079c3b 缺少的文件 2024-01-06 10:52:36 +08:00
limingyu 9d8d1d4f7a 八项作业对接问题修改1 2024-01-05 15:12:26 +08:00
1261008090@qq.com 3da9ff64aa Merge branch 'czks1.0' of http://47.92.113.182:3000/czks/qa-prevention-czks-b into czks1.0 2024-01-05 14:15:20 +08:00
1261008090@qq.com df3c2fa9ee 人员定位 2024-01-05 14:14:52 +08:00
songwenxuan b9e6f60fff Merge remote-tracking branch 'origin/czks1.0' into czks1.0 2024-01-05 10:46:53 +08:00
songwenxuan 7f54a389f7 pc端对接问题修复 2024-01-05 10:46:28 +08:00
limingyu 981d788c5d 动火作业bug修改1 2024-01-04 16:17:17 +08:00
limingyu 746285d34c 应急资源管理bug修改 2024-01-04 14:20:36 +08:00
liulixin d4ae1c385d bug fix 2024-01-03 17:26:34 +08:00
songwenxuan 32928c77ea Merge remote-tracking branch 'origin/czks1.0' into czks1.0 2024-01-03 17:04:41 +08:00
songwenxuan 87f693a26c pc端对接问题修复 2024-01-03 17:04:30 +08:00
chenxinying 38864124bf Merge remote-tracking branch 'origin/czks1.0' into czks1.0 2024-01-03 09:36:07 +08:00
chenxinying d99b4fa396 map dockData而不是pd dockData 2024-01-03 09:35:57 +08:00
limingyu 52b5698a7e 八项作业app对接 bug修改 2024-01-02 18:16:44 +08:00
songwenxuan 1e72756a07 Merge remote-tracking branch 'origin/czks1.0' into czks1.0 2024-01-02 16:49:01 +08:00
songwenxuan d505ea199b pc端对接问题修复 2024-01-02 16:48:49 +08:00
liulixin 199a689e34 NPE 2024-01-02 16:32:59 +08:00
liujun 4be8922c59 相关方端bug 2024-01-02 14:12:40 +08:00
limingyu 178f531c3e 八项作业app bug修改 2024-01-02 09:44:01 +08:00
songwenxuan 404bb8547a pc端对接问题修复 2023-12-29 17:42:29 +08:00
songwenxuan 7fb1cc39e1 Merge remote-tracking branch 'origin/czks1.0' into czks1.0 2023-12-29 17:36:49 +08:00
songwenxuan e03d531107 pc端对接问题修复 2023-12-29 17:36:09 +08:00
dearlin 636ad0931e Merge remote-tracking branch 'origin/czks1.0' into czks1.0 2023-12-29 14:46:37 +08:00
dearlin 04e915e1a4 图片前缀 2023-12-29 14:46:25 +08:00
songwenxuan 059e5aaa1d 对接代码dockData补充 2023-12-29 12:01:13 +08:00
songwenxuan 76121e6cb1 对接代码dockData补充 2023-12-29 11:28:58 +08:00
songwenxuan 9d3e6e06d4 Merge remote-tracking branch 'origin/czks1.0' into czks1.0 2023-12-29 11:27:27 +08:00
songwenxuan c81dd7dcbd 对接代码dockData补充 2023-12-29 11:26:41 +08:00
dearlin cb54c67d4e 重点工程流程完善 2023-12-29 11:05:41 +08:00
dearlin 0e778fd1d9 fix:使用的库不准确的问题 2023-12-28 21:34:59 +08:00
dearlin b2733dd3d1 add:合并线上代码 2023-12-28 20:03:02 +08:00
dearlin d5530c6ee6 add:重点工程数据同步 2023-12-28 19:51:22 +08:00
dearlin a7f6193998 add:重点工程数据同步 2023-12-28 19:33:26 +08:00
zhaoyu e2dc13b349 Merge remote-tracking branch 'origin/dev' into dev 2023-12-28 16:45:36 +08:00
zhaoyu 18b1a824b4 对接到沧州矿石 2023-12-28 16:45:28 +08:00
dearlin 3a66270a6f Merge remote-tracking branch 'origin/dev' into dev 2023-12-28 14:07:10 +08:00
dearlin cb3db28e83 add：数据同步配置文件 2023-12-28 14:06:55 +08:00
liujun a2caf30b90 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/resources/application-dev.properties
#	src/main/resources/application-local.properties
#	src/main/resources/application-master.properties
 2023-12-28 13:53:41 +08:00
dearlin fa82dc7272 add：港务局数据同步注解与配置 2023-12-28 13:49:21 +08:00
songwenxuan f36417ce03 Merge remote-tracking branch 'origin/czks1.0' into czks1.0 2023-12-28 13:45:58 +08:00
songwenxuan 26dbfb49ce 对接代码新加 2023-12-28 13:45:43 +08:00