 zhangyue
|
7f4829c28b
|
连接oracle
|
2024-01-17 09:55:35 +08:00 |
|
zhangyue
|
f5f001d7bb
|
连接oracle
|
2024-01-17 09:54:58 +08:00 |
|
zhangyue
|
ca28cfaf66
|
配置文件增加redis
|
2024-01-16 09:02:09 +08:00 |
|
zhangyue
|
b06a93f468
|
初始化
|
2024-01-15 18:28:47 +08:00 |
|
zhangyue
|
4a13c01caf
|
测试删除
|
2024-01-10 13:32:46 +08:00 |
 songwenxuan
|
577df3bc45
|
门禁 人员闸机相关接口
|
2024-01-10 08:54:57 +08:00 |
|
zhangyue
|
905576b68b
|
视频获取
|
2024-01-09 19:20:45 +08:00 |
|
zhangyue
|
25077ea9a6
|
Merge branch 'cmt1.0' into dev
# Conflicts:
# src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java
# src/main/java/com/zcloud/util/ReturnMap.java
# src/main/resources/application-dev.properties
# src/main/resources/application-local.properties
# src/main/resources/application-master.properties
# src/main/resources/application.properties
# src/main/resources/mybatis/datasource/gatemachine/GateAreaMapper.xml
# src/main/resources/mybatis/datasource/gatemachine/GateMachineMapper.xml
# src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml
|
2024-01-08 15:43:52 +08:00 |
DESKTOP-7VLMG81\Administrator
|
84245b934c
|
地图人员定位
|
2024-01-08 14:17:14 +08:00 |
|
zhangyue
|
c07b6534b9
|
Merge branch 'dev1' into dev
|
2024-01-08 10:52:27 +08:00 |
|
zhangyue
|
df4f35d1fb
|
门口门禁
|
2024-01-08 10:30:17 +08:00 |
 dearlin
|
331e779e11
|
add: 数据同步相关aop功能迁移
|
2023-12-17 15:48:56 +08:00 |
|
dearlin
|
9757d08f69
|
数据同步相关代码
|
2023-12-17 15:44:38 +08:00 |
|
dearlin
|
7073565e0b
|
add: 沧州矿石代码同步加地图版本
|
2023-12-17 15:29:45 +08:00 |
zhaoyu
|
1cb56a5c82
|
正式配置修改
|
2023-12-14 19:42:21 +08:00 |
|
zhaoyu
|
a63fd74460
|
Merge remote-tracking branch 'origin/lmy20231113' into 相关方关联分公司功能
|
2023-12-14 19:33:34 +08:00 |
guoyuepeng
|
88be88ad31
|
正式地址配置信息
|
2023-12-14 19:32:32 +08:00 |
|
zhaoyu
|
190f0dc838
|
Merge remote-tracking branch 'origin/相关方关联分公司功能' into 相关方关联分公司功能
|
2023-12-14 17:23:51 +08:00 |
|
zhaoyu
|
8446811b6f
|
搜索bug处理
|
2023-12-14 17:23:42 +08:00 |
 liujun
|
71e3449f48
|
12618 编辑页面 判空提示语不正确
|
2023-12-14 16:50:11 +08:00 |
|
zhaoyu
|
253f559ba5
|
是否发送短信字段
|
2023-12-14 09:52:05 +08:00 |
|
zhaoyu
|
9469e9c1db
|
Merge remote-tracking branch 'origin/相关方关联分公司功能' into 相关方关联分公司功能
|
2023-12-13 14:45:23 +08:00 |
|
zhaoyu
|
cfc13f4ae0
|
企业端缺失功能补全
|
2023-12-13 14:45:11 +08:00 |
|
liujun
|
c998e2ebb0
|
bug修复
|
2023-12-12 19:16:04 +08:00 |
|
zhaoyu
|
2521ccf737
|
部署31专用配置文件
|
2023-12-12 10:24:05 +08:00 |
|
zhaoyu
|
e0d63a1bcb
|
部署31配置文件修改
|
2023-12-12 10:23:44 +08:00 |
|
zhaoyu
|
25bcb42ad0
|
Merge branch '1122-动火台账' into 相关方关联分公司功能
|
2023-12-11 17:59:10 +08:00 |
|
zhaoyu
|
dfcc0cb817
|
Merge remote-tracking branch 'origin/liujun-2023-12-05-相关方需求变更' into 相关方关联分公司功能
|
2023-12-11 17:59:02 +08:00 |
limingyu
|
98dc83e051
|
延时监火改为多人同时监火，在同一个部门中都可以查看和发布监火信息
|
2023-12-11 10:00:16 +08:00 |
|
liujun
|
32f2a32e67
|
历史bug修复
|
2023-12-07 15:02:01 +08:00 |
|
limingyu
|
72cb39f096
|
曹妃甸动火作业搬到港务局4
|
2023-12-05 14:13:49 +08:00 |
|
limingyu
|
4111ee1565
|
Merge branch 'dev' into lmy20231113
|
2023-12-05 14:08:10 +08:00 |
|
limingyu
|
335d1e04fd
|
曹妃甸动火作业搬到港务局3
|
2023-12-05 13:45:52 +08:00 |
|
dearlin
|
c2b835ebfa
|
add: 定位卡号维护信息
|
2023-11-28 16:57:13 +08:00 |
|
dearlin
|
6d238d6cc1
|
fix: 重点工程处罚管理 里面的隐患没有区分重点工程项目 每个重点工程点进去都一样
|
2023-11-22 16:56:33 +08:00 |
|
zhaoyu
|
86e10c7966
|
Merge branch 'dev' into 1122-动火台账
|
2023-11-22 16:33:18 +08:00 |
|
zhaoyu
|
e3be1f21d7
|
Merge branch 'zdgc-duanxin' into dev
|
2023-11-22 16:31:40 +08:00 |
|
zhaoyu
|
a4e65f049f
|
动火台账增加展示以及搜索条件
|
2023-11-22 14:37:03 +08:00 |
|
limingyu
|
ff9dc890bf
|
Merge remote-tracking branch 'origin/dev' into lmy20231113
|
2023-11-17 14:19:56 +08:00 |
|
zhaoyu
|
8e5325bd17
|
调整处罚短信接口逻辑
|
2023-11-16 17:20:16 +08:00 |
|
dearlin
|
4678fb2bc3
|
fix:测试环境配置文件修正
|
2023-11-15 16:25:34 +08:00 |
|
dearlin
|
d1600cd7ce
|
fix:ai报警手机端不显示隐患验收的信息
|
2023-11-14 14:07:41 +08:00 |
|
limingyu
|
5b22778601
|
曹妃甸动火作业搬到港务局
|
2023-11-14 10:16:26 +08:00 |
|
dearlin
|
8fc5375db9
|
一般隐患台账导出，监管端的创建人和发现人 没有显示数据 注意按列导出
|
2023-11-08 14:37:24 +08:00 |
|
wangxuan
|
b5b5aba4dc
|
Merge pull request 'BUILD: x1108改造配置文件方便部署' (#1) from x1108 into dev
Reviewed-on: #1
|
2023-11-08 11:09:48 +08:00 |
|
dearlin
|
15d9942227
|
删除无用的文件
|
2023-11-08 11:06:39 +08:00 |
|
dearlin
|
8f1868e6cd
|
改造配置文件
|
2023-11-08 10:24:18 +08:00 |
|
guoyuepeng
|
71846cb62a
|
初始化
|
2023-11-08 08:53:50 +08:00 |
|
guoyuepeng
|
9e993610b0
|
初始化
|
2023-11-07 09:32:12 +08:00 |