Commit Graph

35 Commits (3764db33a3956179a4ec83562e06f61feea01ce9)

Author SHA1 Message Date
dearlin 7437aa1395 沧州矿石文件导入报错 2024-01-09 10:58:26 +08:00
dearlin 6fef2c1407 沧州矿石数据同步日志 2024-01-06 15:24:03 +08:00
liulixin d4ae1c385d bug fix 2024-01-03 17:26:34 +08:00
limingyu 52b5698a7e 八项作业app对接 bug修改 2024-01-02 18:16:44 +08:00
liulixin 199a689e34 NPE 2024-01-02 16:32:59 +08:00
limingyu 178f531c3e 八项作业app bug修改 2024-01-02 09:44:01 +08:00
limingyu ea0e12e364 沧州矿石数据对接临时用电、动火作业 2023-12-26 09:27:57 +08:00
dearlin ca90a38964 数据字典,动土与断路 2023-12-26 08:45:44 +08:00
limingyu ba3754c78f 沧州矿石数据对接盲板作业、临时用电、吊装作业 2023-12-25 15:08:06 +08:00
dearlin 4e4ac731e6 八项作业 2023-12-25 14:46:14 +08:00
dearlin 87aee42fdb 八项作业 2023-12-25 14:42:45 +08:00
dearlin f18132db06 Merge branch '1212-八项作业迁移' into czks1.0
# Conflicts:
#	src/main/java/com/zcloud/controller/system/LoginController.java
2023-12-25 14:37:27 +08:00
zhaoyu 195b9d4de0 处理数据丢失问题 2023-12-22 09:22:58 +08:00
dearlin 43edc5ee1e 八项作业 2023-12-22 09:08:17 +08:00
limingyu d44ba70a52 沧州矿石数据对接有限空间作业 2023-12-20 15:25:17 +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
liujun d50f6f2d28 八项作业前端更新 2023-12-19 17:12:17 +08:00
dearlin 54dffe99ab 合并重点工程 2023-12-19 15:46:18 +08:00
zhaoyu 0d9228dda4 八项作业优化 正向流程bug修复 2023-12-17 15:53:55 +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 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
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
guoyuepeng 9e993610b0 初始化 2023-11-07 09:32:12 +08:00