Commit Graph

  • 6fef2c1407 沧州矿石数据同步日志 dearlin 2024-01-06 15:24:03 +0800
  • 12d0079c3b 缺少的文件 dearlin 2024-01-06 10:52:36 +0800
  • 9d8d1d4f7a 八项作业对接问题修改1 limingyu 2024-01-05 15:12:26 +0800
  • 3da9ff64aa Merge branch 'czks1.0' of http://47.92.113.182:3000/czks/qa-prevention-czks-b into czks1.0 1261008090@qq.com 2024-01-05 14:15:20 +0800
  • df3c2fa9ee 人员定位 1261008090@qq.com 2024-01-05 14:14:52 +0800
  • b9e6f60fff Merge remote-tracking branch 'origin/czks1.0' into czks1.0 songwenxuan 2024-01-05 10:46:53 +0800
  • 7f54a389f7 pc端对接问题修复 songwenxuan 2024-01-05 10:46:28 +0800
  • 981d788c5d 动火作业bug修改1 limingyu 2024-01-04 16:17:17 +0800
  • 746285d34c 应急资源管理bug修改 limingyu 2024-01-04 14:20:36 +0800
  • d4ae1c385d bug fix liulixin 2024-01-03 17:26:34 +0800
  • 32928c77ea Merge remote-tracking branch 'origin/czks1.0' into czks1.0 songwenxuan 2024-01-03 17:04:41 +0800
  • 87f693a26c pc端对接问题修复 songwenxuan 2024-01-03 17:04:30 +0800
  • 38864124bf Merge remote-tracking branch 'origin/czks1.0' into czks1.0 chenxinying 2024-01-03 09:36:07 +0800
  • d99b4fa396 map dockData而不是pd dockData chenxinying 2024-01-03 09:35:57 +0800
  • 52b5698a7e 八项作业app对接 bug修改 limingyu 2024-01-02 18:16:44 +0800
  • 1e72756a07 Merge remote-tracking branch 'origin/czks1.0' into czks1.0 songwenxuan 2024-01-02 16:49:01 +0800
  • d505ea199b pc端对接问题修复 songwenxuan 2024-01-02 16:48:49 +0800
  • 199a689e34 NPE liulixin 2024-01-02 16:32:59 +0800
  • 4be8922c59 相关方端bug liujun 2024-01-02 14:12:40 +0800
  • 178f531c3e 八项作业app bug修改 limingyu 2024-01-02 09:44:01 +0800
  • 404bb8547a pc端对接问题修复 songwenxuan 2023-12-29 17:42:29 +0800
  • 7fb1cc39e1 Merge remote-tracking branch 'origin/czks1.0' into czks1.0 songwenxuan 2023-12-29 17:36:49 +0800
  • e03d531107 pc端对接问题修复 songwenxuan 2023-12-29 17:36:09 +0800
  • 636ad0931e Merge remote-tracking branch 'origin/czks1.0' into czks1.0 dearlin 2023-12-29 14:46:37 +0800
  • 04e915e1a4 图片前缀 dearlin 2023-12-29 14:46:25 +0800
  • 059e5aaa1d 对接代码dockData补充 songwenxuan 2023-12-29 12:01:13 +0800
  • 76121e6cb1 对接代码dockData补充 songwenxuan 2023-12-29 11:28:58 +0800
  • 9d3e6e06d4 Merge remote-tracking branch 'origin/czks1.0' into czks1.0 songwenxuan 2023-12-29 11:27:27 +0800
  • c81dd7dcbd 对接代码dockData补充 songwenxuan 2023-12-29 11:26:41 +0800
  • cb54c67d4e 重点工程流程完善 dearlin 2023-12-29 11:05:41 +0800
  • 0e778fd1d9 fix:使用的库不准确的问题 dearlin 2023-12-28 21:34:59 +0800
  • b2733dd3d1 add:合并线上代码 dearlin 2023-12-28 20:03:02 +0800
  • d5530c6ee6 add:重点工程数据同步 dearlin 2023-12-28 19:51:22 +0800
  • a7f6193998 add:重点工程数据同步 dearlin 2023-12-28 19:33:26 +0800
  • e2dc13b349 Merge remote-tracking branch 'origin/dev' into dev zhaoyu 2023-12-28 16:45:36 +0800
  • 18b1a824b4 对接到沧州矿石 zhaoyu 2023-12-28 16:45:28 +0800
  • 3a66270a6f Merge remote-tracking branch 'origin/dev' into dev dearlin 2023-12-28 14:07:10 +0800
  • cb3db28e83 add:数据同步配置文件 dearlin 2023-12-28 14:06:55 +0800
  • a2caf30b90 Merge remote-tracking branch 'origin/dev' into dev liujun 2023-12-28 13:53:41 +0800
  • fa82dc7272 add:港务局数据同步注解与配置 dearlin 2023-12-28 13:49:21 +0800
  • f36417ce03 Merge remote-tracking branch 'origin/czks1.0' into czks1.0 songwenxuan 2023-12-28 13:45:58 +0800
  • 26dbfb49ce 对接代码新加 songwenxuan 2023-12-28 13:45:43 +0800
  • dd2f6b3f1e 线上代码合并到czks1.0 dearlin 2023-12-28 13:40:16 +0800
  • 9912c725af Merge remote-tracking branch 'origin/2023年12月27日V01.00.50' into czks1.0 dearlin 2023-12-28 12:00:38 +0800
  • bc05a89ae6 合并线上代码 dearlin 2023-12-28 11:58:54 +0800
  • 06bd2c9074 添加 更新.md guoyuepeng 2023-12-28 10:43:24 +0800
  • 3575a5fc28 Merge remote-tracking branch 'origin/czks1.0' into czks1.0 z 2023-12-28 10:27:54 +0800
  • 77bdb85662 重点工程部分代码 z 2023-12-28 10:23:30 +0800
  • 9becfa6a9f 档案,学习,特种设备 dearlin 2023-12-28 09:18:15 +0800
  • 70f17b2515 一公司驾驶舱 地图 新动火标点 limingyu 2023-12-27 19:48:00 +0800
  • d13f438573 Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 liujun 2023-12-27 15:14:27 +0800
  • 774841542e 相关方端bug liujun 2023-12-27 15:13:47 +0800
  • b057d96317 学习园地、教育培训功能数据同步功能 liujun 2023-12-27 14:50:18 +0800
  • 4d28af17ce Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 limingyu 2023-12-27 11:20:21 +0800
  • 7b9d086d55 Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 main zhaoyu 2023-12-27 11:12:59 +0800
  • 4574316eee 处理海康空指针问题 zhaoyu 2023-12-27 11:12:51 +0800
  • fcaaf11700 Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 limingyu 2023-12-27 10:35:17 +0800
  • 19181555b8 Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 dearlin 2023-12-27 10:22:30 +0800
  • 6a7ec92c75 fix: app用户登录时候后台地址问题 dearlin 2023-12-27 10:21:55 +0800
  • ede3341677 一公司驾驶舱 首页 右下角没有显示新动火的数据 limingyu 2023-12-27 09:30:21 +0800
  • 86765ce3c7 Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 guoyuepeng 2023-12-26 17:26:51 +0800
  • c346cd9d4e Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 zhaoyu 2023-12-26 16:57:09 +0800
  • 91c3ebdcfc 图片地址 zhaoyu 2023-12-26 16:56:49 +0800
  • 5bf53a82a6 修改pc端动火作业动火区域管辖单位显示bug limingyu 2023-12-26 16:42:56 +0800
  • 0a7cacc666 测试环境和正式环境的配置信息, guoyuepeng 2023-12-26 16:21:52 +0800
  • d05156eee2 Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 zhaoyu 2023-12-26 16:11:36 +0800
  • 42ea8d5208 高处作业迁移补充 zhaoyu 2023-12-26 16:11:26 +0800
  • ee37e8e021 Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 guoyuepeng 2023-12-26 14:02:28 +0800
  • a8378f01f0 Merge remote-tracking branch 'origin/liujun-2023-12-18-相关方需求更新' into 1212-八项作业迁移 liujun 2023-12-26 13:45:38 +0800
  • e1cd46b493 bug修复 liujun 2023-12-26 12:35:28 +0800
  • e86570bb8d 无dockData不发送消息 dearlin 2023-12-26 11:54:38 +0800
  • 021a6551a3 动态地址的默认信息 guoyuepeng 2023-12-26 11:48:51 +0800
  • 1894777d56 安全承诺完成 dearlin 2023-12-26 11:41:06 +0800
  • 7a85418098 Merge pull request '分公司可以创建角色等信息' (#7) from corpSystem into 1212-八项作业迁移 guoyuepeng 2023-12-26 09:54:14 +0800
  • ea0e12e364 沧州矿石数据对接临时用电、动火作业 limingyu 2023-12-26 09:27:57 +0800
  • b9622c745f Merge remote-tracking branch 'origin/czks1.0' into czks1.0 dearlin 2023-12-26 08:45:56 +0800
  • ca90a38964 数据字典,动土与断路 dearlin 2023-12-26 08:45:44 +0800
  • 797a8c0586 bug修复 liujun 2023-12-25 18:17:09 +0800
  • e8a856838a Merge remote-tracking branch 'origin/czks1.0' into czks1.0 songwenxuan 2023-12-25 17:51:41 +0800
  • d06234ea16 排班对接代码 songwenxuan 2023-12-25 17:51:16 +0800
  • ba3754c78f 沧州矿石数据对接盲板作业、临时用电、吊装作业 limingyu 2023-12-25 15:08:06 +0800
  • 4e4ac731e6 八项作业 dearlin 2023-12-25 14:46:14 +0800
  • 4f60d4f571 解决无法多选bug liujun 2023-12-25 14:45:17 +0800
  • 9fd3b521c0 Merge remote-tracking branch 'origin/czks1.0' into czks1.0 dearlin 2023-12-25 14:42:58 +0800
  • 87aee42fdb 八项作业 dearlin 2023-12-25 14:42:45 +0800
  • f18132db06 Merge branch '1212-八项作业迁移' into czks1.0 dearlin 2023-12-25 14:37:27 +0800
  • 0e1e91eb28 Merge branch '1212-八项作业迁移' into 1212-八项作业迁移 wangxuan 2023-12-25 14:34:53 +0800
  • c8e4eb4972 Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 limingyu 2023-12-25 14:13:48 +0800
  • 72793b2a76 Merge branch 'lmy20231215-动火bug修改' into 1212-八项作业迁移 limingyu 2023-12-25 13:58:14 +0800
  • c82b1a7a01 Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移 zhaoyu 2023-12-25 13:55:33 +0800
  • ce4aafb5af Merge branch 'zy-1218-重点工程播放视频' into 1212-八项作业迁移 zhaoyu 2023-12-25 13:55:16 +0800
  • 696c3eab44 安全环保检查对接代码 songwenxuan 2023-12-25 10:45:30 +0800
  • e42976afc5 消防资源管理对接代码 songwenxuan 2023-12-25 10:29:49 +0800
  • 792ee76c9c 消防资源管理对接代码 songwenxuan 2023-12-23 14:05:05 +0800
  • 46b4239571 add: app用户登录时候后台地址问题 dearlin 2023-12-23 11:36:32 +0800
  • 9a06cfa206 消防资源管理对接代码 songwenxuan 2023-12-23 10:49:42 +0800
  • 40cbbe7dcc 查看bug修复 liujun 2023-12-23 10:27:04 +0800
  • 8be39e14d3 查看bug修复 liujun 2023-12-22 17:41:36 +0800
  • 0e22d45975 增加坐标 zhaoyu 2023-12-22 17:09:54 +0800
  • 93679092de 查看bug修复 liujun 2023-12-22 17:07:44 +0800