Commit Graph

Select branches

Hide Pull Requests

zhongwei

Mono Color

• 1b4e7c6d4e Merge remote-tracking branch 'origin/master' haungxing 2023-07-07 16:59:28 +0800
• 0bacf3efe1 # 设备巡检内容批量更新接口 haungxing 2023-07-07 16:59:20 +0800
• 6b022b9da4 两票生成月报生成修改 段飞宇 2023-07-07 16:11:25 +0800
• 0eeb193158 #风电 yang_shj 2023-07-07 16:08:37 +0800
• d9323a1cc0 # contentEntity添加name的筛选方式 haungxing 2023-07-07 15:54:56 +0800
• 39dc80e072 Merge remote-tracking branch 'origin/master' haungxing 2023-07-07 15:44:10 +0800
• 0917b88829 # 根据设备项目获取巡检项目以及巡检内容接口 haungxing 2023-07-07 15:44:00 +0800
• f369ee6a52 #风电 yang_shj 2023-07-07 14:19:16 +0800
• f8addf2929 Merge remote-tracking branch 'origin/master' yang_shj 2023-07-07 14:16:13 +0800
• 69eb41b08e #风电 yang_shj 2023-07-07 14:15:50 +0800
• 850bec042e 修复消缺流程bug-消缺消息推送 tyty 2023-07-07 09:57:36 +0800
• 030d3c69f6 Merge remote-tracking branch 'origin/prod' yang_shj 2023-07-06 17:17:16 +0800
• f62c1a8224 #风电 yang_shj 2023-07-06 17:16:28 +0800
• bfca190b86 修复消缺流程bug-消缺消息推送 tyty 2023-07-06 16:23:44 +0800
• 2f676597ae 两票生成月报列表与下载 段飞宇 2023-07-06 15:32:04 +0800
• 8b39ab9aee 修复消缺流程bug tyty 2023-07-06 14:18:43 +0800
• 45f2bfe221 Merge remote-tracking branch 'origin/master' haungxing 2023-07-06 11:13:42 +0800
• 418c1c1023 # 站点类型推送FDP配置接口 haungxing 2023-07-06 11:13:35 +0800
• dbb75908db Merge remote-tracking branch 'origin/master' yang_shj 2023-07-06 11:07:55 +0800
• 06a3760844 #设备排序 yang_shj 2023-07-06 11:07:41 +0800
• 94d5da7c9e Merge remote-tracking branch 'origin/master' tyty 2023-07-06 11:05:25 +0800
• 7dac2613c3 修复消缺流程bug tyty 2023-07-06 11:05:16 +0800
• ebf69d182d Merge remote-tracking branch 'origin/master' haungxing 2023-07-05 17:33:15 +0800
• 0dc66e9f8b # 巡检内容定义查询接口 haungxing 2023-07-05 17:33:08 +0800
• 5442896d15 pom文件修改 段飞宇 2023-07-05 17:29:52 +0800
• 6841ab8f4c #智能生产排序 yang_shj 2023-07-05 17:15:21 +0800
• 0214541df1 Merge remote-tracking branch 'origin/master' tyty 2023-07-05 15:16:04 +0800
• 225912f6f9 修复消缺流程bug tyty 2023-07-05 15:15:54 +0800
• 407fdd6c36 Merge remote-tracking branch 'origin/master' yang_shj 2023-07-05 14:20:20 +0800
• a296d23e83 #报表导出修改 yang_shj 2023-07-05 14:20:05 +0800
• 05a1a64d7d 两票统计分析生成功能 段飞宇 2023-07-05 12:32:27 +0800
• 4ef691ad9e pon文件修改 段飞宇 2023-07-05 12:30:27 +0800
• a975cafa50 #报表导出修改 yang_shj 2023-07-04 17:36:00 +0800
• e8c99dca9e #pom修改 yang_shj 2023-07-04 15:25:08 +0800
• e4814dee89 Merge remote-tracking branch 'origin/master' yang_shj 2023-07-04 15:20:39 +0800
• b16d91a017 # 巡检内容新增时编码自动生成 # feign接口新建巡检项目巡检类型自动填入 haungxing 2023-07-04 15:04:15 +0800
• bc262210b3 Merge remote-tracking branch 'origin/master' yang_shj 2023-07-04 14:52:20 +0800
• ef89b5ac0b Merge remote-tracking branch 'origin/prod' yang_shj 2023-07-04 14:51:31 +0800
• 50b3340088 # 巡检定义脚本修改、巡检内容实体类修改 haungxing 2023-07-04 14:37:39 +0800
• a3d43d1ea1 Merge remote-tracking branch 'origin/master' haungxing 2023-07-04 14:01:06 +0800
• 8865a8ecd6 # 巡检定义巡检内容list查询条件将IDS由String变更为List<Long> # pom文件依赖问题修改 haungxing 2023-07-04 14:00:46 +0800
• 32ad7b8ff6 智能诊断-数据溯源 tyty 2023-07-04 13:59:57 +0800
• c067dd503a Merge remote-tracking branch 'origin/master' haungxing 2023-07-04 10:31:40 +0800
• c178f4c648 # 添加设备巡检内容批量更新的feign接口 haungxing 2023-07-04 10:31:33 +0800
• e1008623e5 Merge remote-tracking branch 'origin/master' yang_shj 2023-07-04 09:34:43 +0800
• 1c87a81957 #检修流程 yang_shj 2023-07-04 09:24:10 +0800
• 2d032a5d39 排班计划导出，入参格式修改 tyty 2023-07-04 08:47:07 +0800
• 7a758088c4 消缺管理-数据溯源版本修改 tyty 2023-07-03 19:39:17 +0800
• 2175cf59fe # getRealId接口添加获取设备实例属性绑定采集点名称 haungxing 2023-07-03 17:08:20 +0800
• 8fc2c0fb7b Merge remote-tracking branch 'origin/master' haungxing 2023-07-03 16:40:35 +0800
• 09475ecf10 # 站点管理新增是否国外字段 haungxing 2023-07-03 16:40:29 +0800
• dbf5347249 Merge remote-tracking branch 'origin/master' tyty 2023-07-03 15:38:55 +0800
• 3e917b2ba6 增加缺陷库-工作票相关字段 tyty 2023-07-03 15:38:48 +0800
• 414b954d36 # 站点集中监控属性排序赋值优化 haungxing 2023-07-03 14:34:35 +0800
• 3ac68a347a # APP_NAME回退 haungxing 2023-06-30 16:19:43 +0800
• 2b17d7c5a7 # haungxing 2023-06-30 16:07:58 +0800
• 01dd0155c4 # 巡检配置优化 haungxing 2023-06-30 16:05:20 +0800
• 8acef522c3 Merge remote-tracking branch 'origin/master' haungxing 2023-06-30 16:00:20 +0800
• 1c7f1a24f5 # 站点集中监控属性配置同步监测点优化 haungxing 2023-06-30 16:00:13 +0800
• 22db8e5abf 修改日志分页查询 段飞宇 2023-06-30 15:59:08 +0800
• f417ae3627 修改日志系统 段飞宇 2023-06-30 11:24:01 +0800
• c8afc3c596 修改日志系统查询 段飞宇 2023-06-30 11:06:24 +0800
• 8cc71cee5f # 修改站点数据填报时推送站点至FDP bug haungxing 2023-06-29 19:52:58 +0800
• 91a0502ac1 修改人员发送统计消息统计 段飞宇 2023-06-29 17:23:03 +0800
• 3e8183bd3c Merge remote-tracking branch 'origin/master' yang_shj 2023-06-29 17:13:51 +0800
• a3c9e3d2c9 #检修流程 yang_shj 2023-06-29 17:13:30 +0800
• 9f78fc42fc 修复消缺代码bug tyty 2023-06-29 17:06:37 +0800
• 990edb29c7 #检修流程 yang_shj 2023-06-29 14:18:09 +0800
• 97ce65a2ee 修复消缺代码bug tyty 2023-06-29 11:30:37 +0800
• 7e4aa99f3b 修复消缺代码bug tyty 2023-06-29 09:46:08 +0800
• f39f4844f3 #检修流程 yang_shj 2023-06-29 09:44:35 +0800
• 56c76f7a37 修复消缺代码bug tyty 2023-06-29 08:59:49 +0800
• 1c406389f4 Merge remote-tracking branch 'origin/master' yang_shj 2023-06-28 18:43:31 +0800
• b0c8d82f61 #检修流程 yang_shj 2023-06-28 18:43:18 +0800
• da365568e2 修改票据安措序号 段飞宇 2023-06-28 16:51:40 +0800
• cda274601a Merge remote-tracking branch 'origin/master' 段飞宇 2023-06-28 16:19:06 +0800
• cc1f33cb3e 票据模板改动 删除operation db 2.0.0 段飞宇 2023-06-28 16:18:57 +0800
• 155b2bd8e8 Merge remote-tracking branch 'origin/master' tyty 2023-06-28 16:13:30 +0800
• dde999cd57 修复消缺代码bug tyty 2023-06-28 16:13:21 +0800
• 7cd5a66be9 #检修流程 yang_shj 2023-06-28 15:50:43 +0800
• 15d8764c8f Merge remote-tracking branch 'origin/master' tyty 2023-06-28 10:48:58 +0800
• 24aaa7424d 提交消缺相关代码 tyty 2023-06-28 10:48:50 +0800
• a4d22de1d5 #检修流程 yang_shj 2023-06-28 10:45:18 +0800
• f7d13453dd 新增票据模板浏览及站点编号唯一效验 段飞宇 2023-06-28 09:04:26 +0800
• eb75e2bae1 Merge remote-tracking branch 'origin/master' haungxing 2023-06-27 14:40:17 +0800
• e0550742b9 # 回退巡检pom.xml版本 haungxing 2023-06-27 14:40:08 +0800
• 445644d455 Merge remote-tracking branch 'origin/master' tyty 2023-06-27 14:34:52 +0800
• 38285a2ba4 更换短信推送阿里云模板 tyty 2023-06-27 14:34:39 +0800
• ef12eb1781 Merge remote-tracking branch 'origin/yang_shj' yang_shj 2023-06-27 11:11:30 +0800
• bf0b40d559 #检修流程 yang_shj 2023-06-27 10:59:33 +0800
• 5b2f100d17 #检修流程 yang_shj 2023-06-26 17:29:14 +0800
• 9a26a84c09 Merge remote-tracking branch 'origin/master' yang_shj 2023-06-26 17:07:38 +0800
• 48c8600428 Merge remote-tracking branch 'origin/yang_shj' yang_shj 2023-06-26 17:07:16 +0800
• da7707ead3 #检修流程 yang_shj 2023-06-26 17:06:52 +0800
• 3035302f2b #检修流程 yang_shj 2023-06-26 15:54:32 +0800
• 1052a8afde #检修流程 yang_shj 2023-06-26 15:43:20 +0800
• fb421ed171 Merge remote-tracking branch 'origin/master' tyty 2023-06-26 14:56:51 +0800
• 425b4db3f7 修改消缺流程相关字段 tyty 2023-06-26 14:43:53 +0800
• 1e253b2fdb 修改消缺流程key tyty 2023-06-26 14:42:51 +0800
• 522c15ccbb Merge remote-tracking branch 'origin/master' yang_shj 2023-06-26 09:49:22 +0800