 songwenxuan
|
059e5aaa1d
|
对接代码dockData补充
|
2023-12-29 12:01:13 +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 |
|
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
|
91c3ebdcfc
|
图片地址
|
2023-12-26 16:56:49 +08:00 |
|
guoyuepeng
|
0a7cacc666
|
测试环境和正式环境的配置信息,
|
2023-12-26 16:21:52 +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 |
|
guoyuepeng
|
021a6551a3
|
动态地址的默认信息
|
2023-12-26 11:48:51 +08:00 |
 guoyuepeng
|
7a85418098
|
Merge pull request '分公司可以创建角色等信息' (#7) from corpSystem into 1212-八项作业迁移
Reviewed-on: #7
|
2023-12-26 09:54:14 +08:00 |
|
liujun
|
797a8c0586
|
bug修复
|
2023-12-25 18:17:09 +08:00 |
|
dearlin
|
4e4ac731e6
|
八项作业
|
2023-12-25 14:46:14 +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 |
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 |
|
zhaoyu
|
c82b1a7a01
|
Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移
|
2023-12-25 13:55:33 +08:00 |
|
zhaoyu
|
ce4aafb5af
|
Merge branch 'zy-1218-重点工程播放视频' into 1212-八项作业迁移
|
2023-12-25 13:55:16 +08:00 |
|
songwenxuan
|
792ee76c9c
|
消防资源管理对接代码
|
2023-12-23 14:05:05 +08:00 |
|
dearlin
|
46b4239571
|
add: app用户登录时候后台地址问题
|
2023-12-23 11:36:32 +08:00 |
|
liujun
|
40cbbe7dcc
|
查看bug修复
|
2023-12-23 10:27:04 +08:00 |
|
zhaoyu
|
0e22d45975
|
增加坐标
|
2023-12-22 17:09:54 +08:00 |
|
liujun
|
93679092de
|
查看bug修复
|
2023-12-22 17:07:44 +08:00 |
|
liujun
|
5d46fa3c4d
|
查看bug修复
|
2023-12-22 15:49:12 +08:00 |
|
liujun
|
cd048126c0
|
查看bug修复
|
2023-12-22 13:39:11 +08:00 |
|
songwenxuan
|
61c7075d4c
|
消防安全管理对接代码
|
2023-12-22 08:42:44 +08:00 |
|
songwenxuan
|
4568e46388
|
消防安全管理对接代码
|
2023-12-22 08:42:29 +08:00 |
|
liujun
|
644ee59398
|
查看bug修复
|
2023-12-21 19:55:08 +08:00 |
|
liujun
|
e552502458
|
查看bug修复
|
2023-12-21 15:15:45 +08:00 |
|
liujun
|
a28d97cea7
|
相关方查看详情统一格式
|
2023-12-21 13:58:57 +08:00 |
|
liujun
|
9e7a5334bd
|
bug修复
|
2023-12-20 19:51:15 +08:00 |
|
dearlin
|
b05da152b8
|
图片传输
|
2023-12-20 17:16:37 +08:00 |
|
liujun
|
8c68daee79
|
bug修复
|
2023-12-20 15:57:29 +08:00 |
|
liujun
|
d8f38ffdcd
|
bug修复
|
2023-12-20 14:49:01 +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 |
|
liujun
|
7360ba8cca
|
bug修复
|
2023-12-19 20:03:25 +08:00 |
|
limingyu
|
990ea8814d
|
修改动火作业数据延时监火审核人显示
|
2023-12-19 18:00:49 +08:00 |
|
z
|
88c2a8fdeb
|
重点工程部分代码
|
2023-12-19 17:52:09 +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 |
|
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 |
|
liujun
|
d50f6f2d28
|
八项作业前端更新
|
2023-12-19 17:12:17 +08:00 |