zhongwei

9ea4cc62f3 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 haungxing 2024-08-05 14:13:15 +0800
55bae1eccd 删除System.out.println 的代码 Jone 2024-08-05 14:12:45 +0800
809aad8d3e fix: 解决安全工器具扫描导出的二维码报错的问题 liwen 2024-08-05 13:56:20 +0800
76a0202bb9 Merge branch 'prod-5.1.3' of http://175.6.40.68:8081/Jone/hzims-back into prod-5.1.3 liwen 2024-08-05 10:36:30 +0800
51b563a0ec fix: 解决物资库存台账的页面异常问题 liwen 2024-08-05 10:36:17 +0800
26045b19eb 修正：缺陷流程initResult去除转移符 ty 2024-08-05 08:41:52 +0800
f92cd2a48a Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 ty 2024-08-03 17:03:40 +0800
5c87898d74 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 yang_shj 2024-08-02 16:04:26 +0800
4aff400b38 #新版告警修改 yang_shj 2024-08-02 16:04:13 +0800
c40da0adc2 Merge branch 'prod-5.1.3' of http://175.6.40.68:8081/Jone/hzims-back into prod-5.1.3 liwen 2024-08-02 13:36:25 +0800
9385780912 fix: 解决设备生命周期中运行台账页面的报错问题 liwen 2024-08-02 12:38:09 +0800
850fed5d6a #水电站点首页接口优化 yang_shj 2024-08-02 11:49:36 +0800
a98da57a75 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 yang_shj 2024-08-02 11:27:21 +0800
6bf30636bd #水电站点首页接口优化 yang_shj 2024-08-02 11:27:06 +0800
eff6959589 fix: 解决我的巡检任务中机构条件查询失效的问题 liwen 2024-08-02 10:15:34 +0800
799370b3c0 fix: 解决巡检项目管理条件查询失效的问题 liwen 2024-08-02 09:56:45 +0800
03f1d5ab70 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 ty 2024-08-01 20:18:25 +0800
b0cfa75a98 修正：证书管理依赖调整 ty 2024-08-01 20:18:10 +0800
a1a0ec76fc Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 haungxing 2024-08-01 19:41:10 +0800
4bc1403afa fix:巡检报备限制状态判断 haungxing 2024-08-01 18:59:31 +0800
6a4ed31bb1 #新版电站首页 yang_shj 2024-08-01 17:56:03 +0800
79264d7985 #新版电站首页 yang_shj 2024-08-01 15:05:41 +0800
f6570f00b4 #祁阳团结功率维问题 yang_shj 2024-08-01 10:57:56 +0800
903e6ab50c Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 liwen 2024-08-01 10:47:44 +0800
8f79ca942d fix: 工作票导出勾选图标异常问题 liwen 2024-08-01 10:47:16 +0800
ffecf0ffdb #新版电站指标信息 yang_shj 2024-08-01 10:26:55 +0800
4db085ff1f #新版电站页面修改 yang_shj 2024-08-01 09:26:28 +0800
3c749f06b5 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 yang_shj 2024-08-01 08:21:22 +0800
889c3110e3 fix: 工作票导出勾选图标异常问题 liwen 2024-07-31 13:42:03 +0800
7192116dc2 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 ty 2024-07-31 09:10:25 +0800
d839a0ec1e 修正：巡检任务统计丢失精度问题 ty 2024-07-31 09:09:08 +0800
64628cfa4a fix：巡检报备无法执行任务bug修复 haungxing 2024-07-31 08:47:31 +0800
8c80d96ab4 fix：巡检对象人员列表修改获取用户名称逻辑 haungxing 2024-07-31 08:45:36 +0800
bd8f7a75c3 add：日常维护计划查询新增站点条件查询 haungxing 2024-07-31 08:44:15 +0800
ee40d4a132 Merge remote-tracking branch 'origin/prod-20240506' into prod-5.1.3 yang_shj 2024-07-31 08:42:31 +0800
32c08e1123 #新版电站页面修改 yang_shj 2024-07-31 08:40:22 +0800
b511cdf1b1 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 haungxing 2024-07-31 08:25:17 +0800
37d9193799 # 设备定义无法新增bug解决 haungxing 2024-07-31 08:24:46 +0800
8d69d189c0 修正：补偿流程逻辑优化 ty 2024-07-30 22:00:57 +0800
d89794d31a 修正：运行日志报错提示词 ty 2024-07-30 19:22:57 +0800
ccad4b1d74 修正：补偿工作流的params转换逻辑 ty 2024-07-30 16:28:19 +0800
ada422ee28 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 ty 2024-07-30 16:24:16 +0800
dbe9b41b6d 修正：补偿工作流的params转换逻辑 ty 2024-07-30 16:24:03 +0800
d5a2be1773 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 yang_shj 2024-07-30 15:12:15 +0800
e8e720800d #新版告警修改 yang_shj 2024-07-30 15:12:03 +0800
c85e25babb Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 ty 2024-07-30 10:20:32 +0800
2c881e0417 调整：调整告警消息推送顺序 ty 2024-07-30 10:20:16 +0800
63b310d47d #新版告警修改 yang_shj 2024-07-30 10:16:33 +0800
f84d172c23 #新版告警修改 yang_shj 2024-07-30 10:15:45 +0800
fc37745154 调整：调整告警消息推送顺序 ty 2024-07-30 10:11:57 +0800
dcba22e179 #集中监控增加设备装机容量 yang_shj 2024-07-29 11:20:49 +0800
d214b181d0 #集中监控增加设备装机容量 yang_shj 2024-07-29 10:22:45 +0800
adc5bb4bcc Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 haungxing 2024-07-26 17:15:00 +0800
d7b4db66cf # 取消危险源位置数据权限 haungxing 2024-07-26 17:14:29 +0800
6920dd6ac9 修正：交接班逻辑漏洞 ty 2024-07-26 10:54:57 +0800
71df561902 #离线巡检图片上传问题修复 yang_shj 2024-07-26 08:18:53 +0800
bc2604e93b 新增：设备维护库设置对应得机构 ty 2024-07-25 22:02:41 +0800
901dfe696e 新增：操作票设备名称 ty 2024-07-25 16:06:27 +0800
ad094b1d9c Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 ty 2024-07-25 16:03:19 +0800
5d8e614d48 修复：操作票逻辑判断修复 ty 2024-07-25 16:02:57 +0800
5ae026cba5 # 巡检feign接口调整 haungxing 2024-07-25 14:32:56 +0800
72a74b8afc Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 haungxing 2024-07-24 19:04:05 +0800
bff12f46b5 # stationMapper新增@Param注解 haungxing 2024-07-24 18:57:47 +0800
2f7a7f3382 修复：操作票逻辑判断修复 ty 2024-07-24 16:59:57 +0800
4d6b80a93e 修复：平台升级，巡检sql冲突 ty 2024-07-24 16:40:18 +0800
1aa0c912a3 #sdk版本升级fix.8 yang_shj 2024-07-24 16:13:04 +0800
d847e5fda0 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 yang_shj 2024-07-24 13:56:32 +0800
f0c70490d8 #app告警查询修改 yang_shj 2024-07-24 13:56:21 +0800
a919638092 #水位调度任务执行 yang_shj 2024-07-24 12:29:35 +0800
b8cabf895f 修复：增加视频配置错误提示 ty 2024-07-24 11:02:01 +0800
4abd5e9c81 #水位调度任务执行 yang_shj 2024-07-24 10:50:46 +0800
9b20dc0417 修复：工作流去掉权限设置 ty 2024-07-23 20:21:33 +0800
e9fd55f69e Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 ty 2024-07-23 17:36:59 +0800
0d721756d1 修复：巡检项目管理增加权限设置 ty 2024-07-23 17:36:22 +0800
05f97d58c4 #app告警查询 yang_shj 2024-07-23 17:35:57 +0800
da774a20ef #新版近3年发电量 yang_shj 2024-07-23 16:43:57 +0800
c74dea48bc #新版近3年发电量 yang_shj 2024-07-23 16:43:48 +0800
13125811af #离线巡检图片上传问题 yang_shj 2024-07-23 14:33:08 +0800
b6614d7c9f #工作任务单班组查询bug修复 yang_shj 2024-07-23 13:45:41 +0800
99b21e5e42 #近3年发电量格式修改 yang_shj 2024-07-22 15:05:38 +0800
a3771fc40f fix: 解决车辆里程统计异常的问题（缺少授权字段） liwen 2024-07-22 15:01:53 +0800
8d0c72fb94 删除项目配置文件 Jone 2024-07-19 14:38:56 +0800
2199b22525 修复：流程判断逻辑 ty 2024-07-18 21:50:09 +0800
eee0993d7c 修复：消息中心类型转换 ty 2024-07-18 15:49:36 +0800
f8bd1b25fb 修复：消息中心类型转换 ty 2024-07-18 15:31:12 +0800
bf18eb0ad5 修复：线下操作票和安全工器具 ty 2024-07-18 15:05:11 +0800
5e664747d5 新增：线下操作票 ty 2024-07-18 11:40:40 +0800
142573b3c7 升级：修改xxljob相关配置 ty 2024-05-28 15:07:29 +0800
41e6e9f674 修改：jar包依赖 ty 2024-07-18 09:11:52 +0800
9951395564 修改：近三年发电量容器修改 ty 2024-07-18 08:24:36 +0800
320af05f98 升级：升级xxljob依赖 ty 2024-07-18 08:24:05 +0800
ab0b0f7ee1 新增:德联一键控制功能 ty 2024-07-16 09:51:22 +0800
6b6d67947e 新增:工作流补偿机制 ty 2024-07-15 14:41:30 +0800
b5f071cff9 #master代码 yang_shj 2024-07-12 17:59:48 +0800
020f5e9b7c #服务默认配置整理 yang_shj 2024-07-12 16:58:55 +0800
96a56875e1 #master代码合并 yang_shj 2024-07-12 16:26:28 +0800
c3ae73fb4c Merge remote-tracking branch 'origin/master' into prod-5.1.3 yang_shj 2024-07-12 16:12:22 +0800
77f0fbbc1f #prod代码合并 yang_shj 2024-07-12 16:08:47 +0800
68ed88192d Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 yang_shj 2024-07-12 15:55:21 +0800
95c8a37d81 Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3 haungxing 2024-07-12 15:53:58 +0800

Commit Graph Select branches Hide Pull Requests zhongwei Mono Color

Commit Graph

Select branches

Hide Pull Requests

zhongwei