 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 |
 guoyuepeng
|
06bd2c9074
|
添加 更新.md
|
2023-12-28 10:43:24 +08:00 |
z
|
3575a5fc28
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
# Conflicts:
# src/main/java/com/zcloud/controller/app/AppImgFilesController.java
# src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java
|
2023-12-28 10:27:54 +08:00 |
|
z
|
77bdb85662
|
重点工程部分代码
|
2023-12-28 10:23:30 +08:00 |
|
dearlin
|
9becfa6a9f
|
档案，学习，特种设备
|
2023-12-28 09:18:15 +08:00 |
|
liujun
|
b057d96317
|
学习园地、教育培训功能数据同步功能
|
2023-12-27 14:50:18 +08:00 |
|
zhaoyu
|
7b9d086d55
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-27 11:12:59 +08:00 |
|
zhaoyu
|
4574316eee
|
处理海康空指针问题
|
2023-12-27 11:12:51 +08:00 |
|
dearlin
|
19181555b8
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
# Conflicts:
# src/main/resources/application-dev.properties
|
2023-12-27 10:22:30 +08:00 |
|
dearlin
|
6a7ec92c75
|
fix: app用户登录时候后台地址问题
|
2023-12-27 10:21:55 +08:00 |
guoyuepeng
|
86765ce3c7
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-26 17:26:51 +08:00 |
|
zhaoyu
|
c346cd9d4e
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-26 16:57:09 +08:00 |
|
zhaoyu
|
91c3ebdcfc
|
图片地址
|
2023-12-26 16:56:49 +08:00 |
limingyu
|
5bf53a82a6
|
修改pc端动火作业动火区域管辖单位显示bug
|
2023-12-26 16:42:56 +08:00 |
|
guoyuepeng
|
0a7cacc666
|
测试环境和正式环境的配置信息,
|
2023-12-26 16:21:52 +08:00 |
|
zhaoyu
|
d05156eee2
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-26 16:11:36 +08:00 |
|
zhaoyu
|
42ea8d5208
|
高处作业迁移补充
|
2023-12-26 16:11:26 +08:00 |
|
guoyuepeng
|
ee37e8e021
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-26 14:02:28 +08:00 |
|
liujun
|
a8378f01f0
|
Merge remote-tracking branch 'origin/liujun-2023-12-18-相关方需求更新' into 1212-八项作业迁移
|
2023-12-26 13:45:38 +08:00 |
|
liujun
|
e1cd46b493
|
bug修复
|
2023-12-26 12:35:28 +08:00 |
|
dearlin
|
e86570bb8d
|
无dockData不发送消息
|
2023-12-26 11:54:38 +08:00 |
|
guoyuepeng
|
021a6551a3
|
动态地址的默认信息
|
2023-12-26 11:48:51 +08:00 |
|
dearlin
|
1894777d56
|
安全承诺完成
|
2023-12-26 11:41:06 +08:00 |
|
guoyuepeng
|
7a85418098
|
Merge pull request '分公司可以创建角色等信息' (#7) from corpSystem into 1212-八项作业迁移
Reviewed-on: #7
|
2023-12-26 09:54:14 +08:00 |
|
limingyu
|
ea0e12e364
|
沧州矿石数据对接临时用电、动火作业
|
2023-12-26 09:27:57 +08:00 |
|
dearlin
|
b9622c745f
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-26 08:45:56 +08:00 |
|
dearlin
|
ca90a38964
|
数据字典，动土与断路
|
2023-12-26 08:45:44 +08:00 |
|
liujun
|
797a8c0586
|
bug修复
|
2023-12-25 18:17:09 +08:00 |
|
songwenxuan
|
e8a856838a
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-25 17:51:41 +08:00 |
|
songwenxuan
|
d06234ea16
|
排班对接代码
|
2023-12-25 17:51:16 +08:00 |
|
limingyu
|
ba3754c78f
|
沧州矿石数据对接盲板作业、临时用电、吊装作业
|
2023-12-25 15:08:06 +08:00 |
|
dearlin
|
4e4ac731e6
|
八项作业
|
2023-12-25 14:46:14 +08:00 |
|
liujun
|
4f60d4f571
|
解决无法多选bug
|
2023-12-25 14:45:17 +08:00 |
|
dearlin
|
9fd3b521c0
|
Merge remote-tracking branch 'origin/czks1.0' into czks1.0
|
2023-12-25 14:42:58 +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 |
|
wangxuan
|
0e1e91eb28
|
Merge branch '1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-25 14:34:53 +08:00 |
|
limingyu
|
c8e4eb4972
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-25 14:13:48 +08:00 |
|
limingyu
|
72793b2a76
|
Merge branch 'lmy20231215-动火bug修改' into 1212-八项作业迁移
# Conflicts:
# src/main/java/com/zcloud/controller/system/LoginController.java
|
2023-12-25 13:58:14 +08:00 |