added 17 commits

• fb850423 - 删除孔范明引入的jar 导致servlet版本过低的问题
• 27340856 - 更新
• de97b84d - Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into develop
• 09676cd8 - 增加集结点、警情二次定位接口
• 8f479bf4 - 添加根据人员id查询公司id接口 调整故障维修单位获取方法
• 1f3eed54 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• b85b252a - 更新
• c13162f0 - Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into develop
• b0e151f3 - 修改参数获取方式
• 38c4a071 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d560fa3b - 删除无用代码
• 4c04c25e - 1.app bug修改
• d35912c6 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 75f45f58 - 1.bug 修改
• e9901c1b - 修改Bug
• 81bfc3cd - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• b121f0f0 - Merge branch 'developer' into chenhao

Compare with previous version

added 1 commit

• bf79528d - 刪除多餘的条件判断，以及对其他方法的影响

Compare with previous version

added 1 commit

• 9f4c01b6 - 修改sql 设置语言

Compare with previous version

added 1 commit

• d36d16ec - 添加消防合同的开始时间

Compare with previous version

added 7 commits

• 4fbfefba - liquibase 错误修改
• 2fbbcb1d - 更新
• dafb0d48 - Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into develop
• 33462341 - 1.修改依赖 及bug
• df895f93 - 删除无用JAR包 增加web端筛选
• a26b587a - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 03b272f6 - Merge branch 'developer' into chenhao

Compare with previous version

added 17 commits

• 4a15ec8b - 修改 辅屏查询接口和导出接口
• 55cb460e - 优化代码 调整分页
• 318ca194 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 8a5614dd - 更新消防监督
• f4d406ca - Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into develop
• 2aa77e9e - 修改代码 参数
• 0185d64d - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• b9e87174 - 优化检查项
• a747858b - Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into develop
• 9583a210 - 1.修改tybootksontime序列化问题
• 06ce621a - 1.app维保记录详情接口重新
• 47d8a4d3 - 更新代码
• 40aacfd6 - Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into develop
• 1156d7c6 - 1.app维保记录详情
• 29834cb2 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 9015fec7 - 修改 辅屏查询接口
• a511391d - 1.删除路线，去掉数据约束-维保

Compare with previous version

added 8 commits

• 94c56af5 - 1,p_check 增加冗余字段业主单位名称
• 27769726 - 修改 联动单位列表BUG修正
• 55603ab5 - 更新
• 732c1fd7 - Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into develop
• 7b8cfff9 - 1.定时任务自动任务生成
• f1162917 - 1.冗余地址
• 11fd085f - 更新CTI相关代码
• 7852d225 - Merge branches 'developer' and 'developer' of 172.16.10.76:moa/amos-boot-biz into developer

Compare with previous version

added 1 commit

• 4c3814ea - 修改BU2503

Compare with previous version

added 1 commit

• ce7b5517 - 修改bug ，联动单位树信息和谈话记录中谈话时间中数据库表更改，以及重点部位数量的统计

Compare with previous version

added 7 commits

• 2e2913b4 - 调整代码架构
• 2fbf82de - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 5c047b9e - 调整配置
• d004ffb2 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 63a97e3f - 服务名提交错误，从新提交
• f9e89e3f - item：修改消防水源默认值查询
• 091776e9 - Merge branch 'developer' into chenhao

Compare with previous version

added 6 commits

• a62b8c59 - Merge branch 'chenhao' into 'developer'
• dce5787f - 检查结果提交
• e2b5c1fa - 修改bug 2408 2580 2566
• 50f7384e - 1.维保app联调bug
• ba4387c6 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 9148cce7 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

Compare with previous version

added 1 commit

• 42aef834 - 添加联动单位统计的数量显示

Compare with previous version

added 4 commits

• 7b79fdbe - 修复bug2655
• af7dcd1e - 修复bug2657
• 5220a2e7 - 1、添加车辆状态接口
• 6d334a34 - Merge branch 'developer' into chenhao

Compare with previous version

added 1 commit

• 750fe7d2 - 任务 3488 changeLog

Compare with previous version

added 6 commits

• b9766029 - 修复bug2673 危化品类型为-1时 没有显示所有的问题
• aebb7018 - Merge remote-tracking branch 'origin/developer' into developer
• 7514ca4f - 修复BUG2676 隐藏导出多余图片字段
• 919dbdff - 1.巡检接口格式化 删除无用代码
• 3fa2ff39 - 任务 3488 changeLog
• c17d2b80 - Merge branch 'developer' into chenhao

Compare with previous version

added 6 commits

• b48dd72a - 修改bug
• 36d6f0cf - 修改bug
• aca8aeb0 - 修改bug
• 4c581c72 - Merge remote-tracking branch 'origin/developer' into developer
• 64ee2ef6 - Merge branch 'chenhao' into 'developer'
• fa926297 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

Compare with previous version

added 1 commit

• 3ae98e3c - 任务 脚本修改

Compare with previous version

added 1 commit

• ce9c45b8 - 修改Bug 2701 按人名/专家领域筛选失效 修改xml中Sql语句

Compare with previous version

added 1 commit

• 53f127a7 - 修改机场单位下重点部位的统计sql

Compare with previous version

added 20 commits

• a885ba24 - 任务3527 重点部位导出模板 id name 未正常配置 by kongfm
• d472496a - Merge remote-tracking branch 'origin/developer' into developer
• ac266ebb - 任务 脚本错误退回
• 8d10706b - 任务 脚本修改
• f42bd835 - liquibase 修改
• 0c71edac - 修复bug2684
• 04b154bf - Merge remote-tracking branch 'origin/developer' into developer
• 719a3305 - 1.reginParam key 修改为："region_" + userId + "_" + token
• 24261721 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• c2738cd5 - Merge branch 'chenhao' into developer
• eadf7bde - 任务 3488 BUG 2193
• 9e000e5c - 添加数据库吧表的修改，对于经纬度的精确度修改
• 39756c60 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• a9fd265c - BUG 2670
• 5cfc86f6 - 1.redis先修改为不同,原因两边序列化方式不一致
• bb2ab374 - 1.装备水源id查询维保记录
• a7995fc0 - item：liquibase巡检脚本维护
• 56da70dd - 1.增加liubase字段 -维保
• 07c87669 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• cd064445 - Merge branch 'developer' into chenhao

Compare with previous version

added 2 commits

• 120283b9 - Bug2407 表头排序失效 xml中添加了排序条件
• 5d1ba33a - Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao

Compare with previous version

added 2 commits

• d9666f9e - 修改bug2698
• 8a7cc9ed - Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao

Compare with previous version

added 1 commit

• c0c7fe10 - 修改bug 人員崗位和學歷多次保存的問題

Compare with previous version

added 3 commits

• 8ae87a00 - bug2407 筛选参数解析异常 修改筛选条件方法 XML中添加了selectAllPage 方法 data代表排序条件 lift 升降序
• 6fab1d04 - Bug 2647 编辑用户所属单位后按单位筛选人员结果错误 增加了 638 639 两行代码 根据修改的部门调整部门code
• 6afdeaa8 - Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao

Compare with previous version

added 1 commit

• 6393d661 - bug2407 筛选参数解析异常 修改筛选条件方法 XML中添加了selectAllPage 方法 data代表排序条件 lift 升降序

Compare with previous version

added 1 commit

• f42c41af - 消防队伍列表按时间倒叙排列order by x.rec_date desc 2021-09-08 by kongfm

Compare with previous version

added 1 commit

• 5912bc13 - 消防队员列表按时间倒叙排列add desc 2021-09-08 by kongfm

Compare with previous version

added 2 commits

• 9f059b5a - 任务 3374 添加GIS地图配置 查看 前端表示getFormValue方法返回值为名称无法回显 要求返回值重新改为code值
• 67f4ee38 - Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao

Compare with previous version

added 2 commits

• daf5c980 - 联动单位列表按时间倒叙排列add order by clu.rec_date desc 同时处理单位根节点-1时查询全部数据问题 2021-09-08 by kongfm
• 8f2f9efd - Merge remote-tracking branch 'origin/chenhao' into chenhao

Compare with previous version

added 1 commit

• b3b3a76e - 消防专家按时间倒叙排列add rec_date 2021-09-08 by kongfm

Compare with previous version

added 2 commits

• c0879a6a - 2021-09-08 前端表示前端传递的address参数已经切割过，后端无需再切割获取 陈召 屏蔽代码 97-102 173-178行
• 1caa996b - Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao

Compare with previous version

added 2 commits

• da739751 - 机场单位人员按时间倒叙排列add order by u.rec_date desc 2021-09-08 by kongfm
• 350947f4 - Merge remote-tracking branch 'origin/chenhao' into chenhao

Compare with previous version

added 1 commit

• 6249f0f7 - 微型消防站按时间倒叙排列add order by cb_fire_station.rec_date desc 2021-09-08 by kongfm

Compare with previous version

added 1 commit

• 31953a6f - 消防水源按时间倒叙排列add order by cb_water_resource.rec_date desc 2021-09-08 by kongfm

Compare with previous version

added 1 commit

• 1b62ecf9 - 危化品按时间倒叙排列add rec_date 2021-09-08 by kongfm

Compare with previous version

added 1 commit

• b8f89f62 - 航空器信息按时间倒叙排列add rec_date 2021-09-08 by kongfm

Compare with previous version

added 2 commits

• 6b31a881 - 任务 3374 添加GIS地图配置 查看 补充提交serviceImpl层
• 427e8239 - Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao

Compare with previous version

added 1 commit

• f65d6dee - 因code不唯一 修改 根据code查询 增添条件 type 判断条件 code相等 type值相等

Compare with previous version

added 1 commit

• e70d7484 - 补充DataDictionaryController层

Compare with previous version

added 1 commit

• f8ba80a6 - 补充DataDictionaryMapper层

Compare with previous version

added 1 commit

• 7e567160 - Revert "因code不唯一 修改 根据code查询 增添条件 type 判断条件 code相等 type值相等"

Compare with previous version

added 1 commit

• 4153ee54 - 因code不唯一 修改 根据code查询 增添条件 type 判断条件 code相等 type值相等 v1

Compare with previous version

added 1 commit

• 7d9ff827 - 数据字典生成树方法 原先通过getCode做主键 现修改为 getSequenceNbr 后期数据字典parent字段保存id 而不要保存code by kongfm 2021-09-08

Compare with previous version

added 1 commit

• c906e643 - 单位编辑后 code值未发生改变 已修改 屏蔽指定类型

Compare with previous version

added 1 commit

• 30ae3bd6 - 数据字典还原 by kongfm 2021-09-09

Compare with previous version

added 1 commit

• c6ed332e - BUG 2740 机场单位主键varchar 导致 通过主键搜索返回多条数据 2021-09-09 by kongfm

Compare with previous version

added 4 commits

• e0405eab - 2021-09-08 前端表示前端传递的address参数已经切割过，后端无需再切割获取 陈召 屏蔽代码 97-102行 173-178行
• 0004dfec - Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao
• c59e67e8 - 机场部门修改时code值也应发生变化，bug 2812 一次删除多条数据 传入类型修改为string
• c7f04539 - Merge remote-tracking branch 'origin/chenhao' into chenhao

Compare with previous version

added 1 commit

• 19587873 - 修改bug冲突

Compare with previous version

added 1 commit

• 71a93a75 - bug 2812 一次删除多条数据 传入类型修改为string

Compare with previous version

added 2 commits

• bdafefc5 - BUG 2806 获取月份第一天和最后一天 2021-09-09 by kongfm
• 88c18f9d - Merge remote-tracking branch 'origin/chenhao' into chenhao

Compare with previous version

added 1 commit

• bee39c63 - Bug 2468 sql语句增添分组条件 22行

Compare with previous version

added 77 commits

• e3bec7f3 - 1.统一用户信息前缀前缀，为biz
• 5d752597 - 1.增加下滑线 前缀区域缓存key
• 4de910dd - *）修改相似警情搜索
• d682d924 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 4a626496 - 修改bug
• 11b0cc2d - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 4a98b776 - BUG 2193
• 62b414f9 - 修复BUG2704
• 18cf3325 - Merge remote-tracking branch 'origin/developer' into developer
• e060c2be - 1.导出修改
• f8449fec - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 8699530d - app-警情处置对象
• aa62c944 - Merge branch 'chenhao' into developer
• 7575c6d4 - 1.删除一对多
• 3e0bac6f - 新增视频工程
• 79e38e34 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• fe5309b5 - 更新tzs119
• 7db354fb - Merge remote-tracking branch 'origin/developer' into developer
• 01494297 - 修复bug2736 导出人员过滤已经删除的数据
• 51949dce - // BUG 2748 联动单位无法保存 bykongfm
• 10f6331c - BUG 2741 首先判断是否为公司 如果公司底下有人员不可直接删除
• d3d40e9f - //BUG 2761 判断人员删除时的逻辑 如果被选为队伍联系人则无法被删除 bykongfm
• 5b8c4dba - 修改Bug2770
• cbe33fd0 - 修改bug2712
• 539887b0 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d5494783 - // BUG 2760 修改消防人员导出模板和 导入问题 bykongfm
• 659da7b2 - Merge remote-tracking branch 'origin/developer' into developer
• 01afe459 - 提交对接视频模块
• 23eb81dc - //BUG 2673 第一次进入没有typecode问题
• 2bded5cc - Merge remote-tracking branch 'origin/developer' into developer
• c90d00b6 - aop 修改，指挥app接口添加
• 37fda09f - 平台配置导出接口bug修改
• 3088e793 - BUG 2500 2406 2123
• 68da1338 - 日志配置修改
• 5d5c2be4 - 修改bug
• 2ce4fc40 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d1a464ab - Merge branch 'chenhao' into developer
• 6970d645 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• a5ac7ac5 - //修复bug2542 by kongfm
• 2e6706d1 - Merge remote-tracking branch 'origin/developer' into developer
• d0f0df8a - // BUG2168 居住地户籍所在地为空判断 bykongfm
• 12da5244 - Merge branch 'chenhao' into developer
• 575cf86c - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d7de4e3b - 修改接口
• 96443c92 - bug修改
• bb09a3c3 - 修改动态表单在页面回显时的bug
• e5abb305 - app 首页
• bed2a8ee - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 43b5268e - 提交孔繁明修改的字典表数据模型逻辑、和bug
• ba46a271 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• f2df9b7b - 修改巡查消息推送接口
• 3a583400 - 指挥app接口
• 4b258a54 - 解决pom文件冲突
• f9fa00de - 修改消息参数传递
• 2e94045e - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d5f23c73 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 234fc10b - app 首页
• 8ca61489 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• a9052f8b - 添加调派任务反馈表 接口
• 8a7501b1 - 增加航空器接口
• d4aff270 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d3297dc5 - 修改根据登陆人获取机场人员信息
• d6e5c4e1 - 防火监督修改
• 5fbcacbb - 修改bug
• 0445ed80 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 2830e40f - 添加手动清楚缓存的方式
• 0c28fb4d - Merge branch 'chenhao' into developer
• c8bf46a7 - 添加启动服务和手动对外的清空redis缓存方法
• 54b36b98 - 修改bug 2795
• 05a812c3 - 修改巡检定时任务因aop未忽略导致参数异常
• a6ccc740 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 8c1f2a40 - 修改bug
• 1f2da0ab - 增jaiapp首頁接口
• 21ac79b6 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 52f5e5b9 - 添加excle导入时默认的操作人
• 4514aac2 - Merge branch 'chenhao' into developer
• 19739748 - 同步代码

Compare with previous version

added 1 commit

• ca86ba05 - 修改excle导出时的关系字段逻辑错误的问题

Compare with previous version

added 1 commit

• 215fb303 - BUG 2807 删除逻辑缺陷，现在前端后端传入 删除月份 2021-09-10 by kongfm

Compare with previous version

added 1 commit

• 7f951635 - BUG 2842 由 BUG2217 2684 新增业务 需要统计消防队伍旗下所有消防队伍信息导致数据逻辑错误 返回错误提示 2021-09-10 by kongfm

Compare with previous version

added 1 commit

• ba5d6b74 - BUG 2846 最初开发人员在动态语句后加入分号导致错误 2021-09-10 by kongfm

Compare with previous version

added 1 commit

• 398e6678 - Bug 2812 修改84行 传参类型改为string

Compare with previous version

added 1 commit

• 7c19d84d - 优化项 965 963 补充数据字典

Compare with previous version

added 1 commit

• 9f417533 - Bug 2870 查询传递参数为Long 如库中sequence_nbr仅末尾数字不同的相连数据 会查询多条。 修改为string 测试无异常。

Compare with previous version

added 1 commit

• 24403eed - bug 2849 已解决 附件保存到公共附件库

Compare with previous version

added 1 commit

• f3228bad - /*bug 2869 部门为空人员详情报空指针

Compare with previous version

added 1 commit

• 9d2a10ad - 2869 部门为空人员详情报空指针 bug 2883 消防人员，新增思想状态保存报错

Compare with previous version

added 1 commit

• 20555c9b - 修改代码

Compare with previous version

added 1 commit

• b344f0ca - bug 2925 故障报修补充功能 我接受收

Compare with previous version

added 1 commit

• 9c112c37 - 修改 故障维修代码

Compare with previous version

added 1 commit

• ee5fa58c - 修改故障时间类型

Compare with previous version

added 1 commit

• e611801e - 补充total参数

Compare with previous version

added 1 commit

• 511367af - //BUG 2920 管网压力字段冗余 BUG 2953 导入模板没有设备编码生成

Compare with previous version

added 1 commit

• f1125ef5 - 隐藏模板中 设备编码字段 后台生成

Compare with previous version

added 1 commit

• 5715baec - bug2468 值班排班，日历视图单班次执勤人数满足≤3且班次≤2时，值班显示方式错误

Compare with previous version

added 1 commit

• 01ebd4e2 - bug 2884 2968 2408

Compare with previous version

added 1 commit

• b0ec72b7 - 2661 灾情详情中字典类数据错误显示为code 改为value值

Compare with previous version

added 1 commit

• 7e2e5b52 - bug 2403 队伍未显示图片

Compare with previous version

added 1 commit

• c89433e4 - 2304 地址 联系人模糊查询缺失

Compare with previous version

added 1 commit

• a0127e96 - bug 2809 关联账号

Compare with previous version

added 1 commit

• da9dedd5 - bug 2943 数据字典增加天然水源状态

Compare with previous version

added 2 commits

• d319fb8f - 提交代码
• 9fa4a660 - Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao

Compare with previous version

added 746 commits

• 4b6f8dc1 - 配置文件修改
• 5dc4c319 - 修改接口
• 675cdd1b - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 9724dd07 - 修改文字错误和excle导入的默认值删除
• 117ab981 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• a42d652e - bug 2824
• f7becd9d - bug 2824
• a0726d53 - 修改根据登陆人获取单位信息
• 5dcfe894 - 修改bug
• e04a7d11 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• abe462ac - bug 2222
• f8acd2d3 - 修改根据登陆人获取单位列表
• 307606d1 - 修改bug2835 、以及经纬度的问题
• abe60a3c - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• b836ed97 - Merge branch 'chenhao' into developer
• 4806bfab - 给所有的excle导入添加了当前模拟的操作人
• 4587d0fb - 修改规则配置及类序列
• b8a25355 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 4f3a7fdf - 巡检隐患表添加字段liqubase
• 777d2540 - item：监督检查业务接口新增及调整
• 981393f9 - 视频配置
• b7d53a4a - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• af6ac50c - 根据groupcode动态表单获取动态表单列
• bd0ccfbb - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• ff3db551 - BUG 2740 2021-09-09 修改后代码冲突被改回去了，现在改正
• 2b0d143d - 修改bug ，增加app 二级列表
• 87a7eca3 - 修改bug
• 8e849d17 - // BUG 3658 优化 by kongfm 2021-09-13 需求详细说明 1. 添加两个字段 2. 地区选择联动 只有新增时带联动 编辑时不带联动 3. 导出模板及导入同步修改
• ac58b1d5 - Merge remote-tracking branch 'origin/developer' into developer
• e82f6fb6 - 巡检检查点--按照部门获取责任人问题
• 73fb7e6a - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 335a5949 - 导出功能统一增加过滤条件，目前实现类都没有传入参数，进行过滤
• 8c325f6a - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• f4cc4a94 - 脚本修改
• 2c98629f - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• df537d21 - 开发需求3667
• 94c4710a - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• c38b6d82 - Merge branch 'chenhao' into developer
• 0974b6e1 - 优化一下sql结构
• a4db10bd - item：监督检查业务接口新增及调整
• 898ffd1d - 修改列标冲突
• 62698a38 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 332ba8bf - 消防监督检查计划修改
• 11507ea9 - 消防监督检查项修改
• 10a4689c - 检查项查询修改
• 6e30dc18 - item：监督检查业务接口新增及调整
• a5c106de - BUG 2807 更新人员车辆排版值班的保存逻辑 如果没有填写数据则保存空数据 。 同步修改 查询 导出相关逻辑 by kongfm 2021-09-14
• 7419f974 - Merge remote-tracking branch 'origin/developer' into developer
• c35a4647 - item：监督检查业检查记录分页接口新增
• 73c75df5 - 不存在值班数据则不查找 修改sql 方法去除 by kongfm 2021-09-14
• 2c81cb13 - Merge branch 'chenhao' into developer
• 5de5edc8 - item：监督检查业检查项关系分页接口新增
• eaa630b0 - Merge remote-tracking branch 'origin/developer' into developer
• 3254cc35 - Merge branch 'chenhao' into developer
• 10b0280d - item：监督检查业检查项关系删除接口新增
• e0a9c4f3 - item：修改监督检查项分页条件
• 5d71d5fe - Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer
• 4791f598 - item：修改监督检查项分页条件
• 40c48449 - 数据库字段添加和修改
• 500d98c6 - Merge remote-tracking branch 'origin/developer' into developer
• d925197c - 修改Bug 中上传文件大小的限制
• 5c981e10 - item：监督检查项新增分页方法
• 22448a8f - 任务 3661
• dfb7cb9f - bug 2881
• cb2fea7c - Merge branch 'chenhao' into developer
• c0dd1e5f - 检查项查询修改
• 77561afa - // 需求 958 新增值班区域 值班区域id 字段 后台同步修改 导入导出逻辑 by kongfm 2021-09-15
• 58f70d3a - Merge remote-tracking branch 'origin/developer' into developer
• c8d99622 - item：plan状态属性统一
• 042a6d73 - 修改2896 ，传值方式的问题
• e9a2d03e - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 628e8a4c - 回退bug2896的修改方法，前端已经对特殊字符传值做了转码处理
• 89c71279 - item：修改检查项关联条件判断
• 3f3a45cf - 修改bug 2933 、 2929
• 7ba47729 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 16352e4d - bug 2880
• 88d5fce8 - BUG2886 因为前期沟通 人员code 可能会发生改变 所以 现在接口code 不再保存，查询数据时通过接口重新赋值 by kongfm 2021-09-16
• b0b8c2bc - Merge remote-tracking branch 'origin/developer' into developer
• fa47b47d - bug 2821
• d73a4148 - bug 2821
• 73ec8a33 - // BUG 2892 导入机场单位没有持证类别和 人员性别 处理 by kongfm 2021-09-16
• 5f70c0af - Merge remote-tracking branch 'origin/developer' into developer
• 02bb65f3 - 还原配置文件
• 2161b67c - BUG 2919 消防水源导出没有设施定义 分类名称 设施编码 维保周期 by kongfm 2021-09-16
• fff85edf - bug 2880
• afce51b8 - 巡检删除后端返回图片拼接ip端口
• 4949ea6f - 120警情填报
• bdc92b74 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 517a8d98 - Merge branch 'developer' into chenhao
• a506ee72 - chenzhao 优化故障
• 4c684788 - 增加数据
• 71b534bc - Merge branch 'chenhao' into developer
• 2cbd9d3e - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 8ba43571 - 新增字段
• 2d93a94a - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 27697e1e - 怎加重点部位接口
• 60a2c52f - 修改bug
• 81f2192f - 增加字段
• 96f63811 - 任务 3713
• 315e86a4 - 任务 3713
• 2bbc1c04 - 添加重点部位信息的建筑经纬度信息到重点部位表
• 184bea34 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 2d37fb13 - 删除多余的引用
• 5d18ea1c - 配置文件还原
• 42c16f34 - Merge remote-tracking branch 'origin/developer' into developer
• 74a0cff1 - item：新增获取用户信息接口
• 0357ea10 - 修改获取经纬度的方法
• 9016d9b2 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 80ae584f - BUG 2935 优化项 分类从93060000 取得字典数据 by kongfm 2021-09-17
• 4fad27be - Merge remote-tracking branch 'origin/developer' into developer
• d1d8e146 - Merge branch 'chenhao' into developer
• d537853f - 修改bug
• 9ef834c8 - 修改主题
• f596cff7 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 5855a55d - 删除多余的注解
• b6683ab5 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 49384f8e - 修改数据
• 0210a46a - item：属性扩展
• 50b3d08c - *）修改amos引用版本
• e917b55c - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 1ae2dd69 - item：获取用户信息接口修改
• 0a4c01cf - 消防监督更新
• 3a8726af - 修改bug
• aa84874b - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• c9ae8a85 - bug 2942
• 32e7af7c - 防火监督-隐患修改
• e5724730 - 增加数据，修改地址
• 84a8048d - 接口不校验逻辑判断更新 根据值班区域获取值班人员接口 不校验token
• 5901d973 - Merge remote-tracking branch 'origin/developer' into developer
• fbbccb9f - 修改bug
• ac58e3da - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 8e463fc1 - 重点部位保存建筑坐标经纬度修正
• d07d10ca - 优化项943 by kongfm
• ad96e8c6 - Merge remote-tracking branch 'origin/developer' into developer
• 28eaf174 - bug 2961
• 6fe2c983 - 关注电梯模块基本代码
• fb3da0ab - 专机保障优化项
• 3b77a1d7 - no message
• 6d4b8777 - item：接口getUserInfo条件修改为IN查询
• 10ef5484 - 关注电梯模块基本代码
• 5675d573 - 增加关联账号
• 7c37c4c4 - *）增加查询巡检接口
• 1873fafc - Merge branch 'chenhao' into developer
• 36ede852 - *）修改方法
• 64f2f018 - *）修改判断写反问题
• 2c8dc34c - 修改巡检服务方法
• 8050892c - Merge branch 'developer-latentDanger' of http://172.16.10.76/moa/amos-boot-biz…
• 3bf50c54 - 计划状态查询修改
• 9134c415 - 公众号接口根据电梯id或电梯应急救援识别码获取电梯信息
• c12f57c3 - 微信后台服务搭建 及 微信公众号openid 及 手机号绑定
• 40af7ccc - 更新获取验证码及保存手机号接口
• 4e2ce70d - 修改bug
• 72d28df8 - 添加公共的工作流执行方法
• cdc7dcc7 - 修改权限校验的方法
• 7001fde2 - tzs-微信公众号 根据code 返回注册用户电话信息及openid
• 08d32ce5 - 警情表添加设备id字段
• 809b6dfb - Merge remote-tracking branch 'origin/developer' into developer
• 1143bb28 - 防火监督更新
• 87482ed6 - 添加busenesskey 的方法
• 07fb0caf - 修改bug
• a97d4879 - 根据任务id 经纬度 返回距离事故电梯距离
• d20f5c18 - Merge remote-tracking branch 'origin/developer' into developer
• df44b7ea - 派遣单添加到达时间 救援完成时间
• 9019eb31 - 修改逻辑执行方法
• 27d16e8a - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• c3d6a5cc - 防火监督修改属性
• 71d3f984 - 1.隐患
• 6a44ae04 - *）新增更新巡检检查项接口
• ae39e4f8 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• ccc7ed31 - 1.修改参数类型
• 0a40ef42 - 1.修改类型为string
• c5640cfd - 1.隐患
• df4bdd4e - 微型消防站配装
• da3cd2bf - *）查询隐患信息
• aad350c9 - 增加参数
• 2d7f8cfa - 我的任务相关接口- 获取任务列表/ 获取任务详情/ 到达判断/ 点击到达按钮 / 点击救援完成按钮
• 53f3476d - Merge remote-tracking branch 'origin/developer' into developer
• 409d9958 - 公众号接口故障报修投诉建议保存接口
• 3f3c0547 - Merge branch 'chenhao' into developer
• 486062e5 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• de4a43ab - Merge branch 'chenhao' into developer
• e1df9dc8 - item：添加防火监督工作流执行
• 787a197d - Merge remote-tracking branch 'origin/developer' into developer
• 887504c4 - 修改错误
• be741fa5 - item：修改防火监督工作流执行
• e11a6139 - item：新增防火监督流程定义key
• 6ae99059 - 隐患修改提交
• 4809cf80 - 2547 增加灾情事件类型匹配规则 xml中同步增加模糊查询 54-56行
• 360d7dd5 - bug 2974 current做约束
• d2d35830 - 我接受统计接口 sql优化
• 18393dae - 隐患修改
• f7e0b2d6 - 新增海康视频对接接口
• 1ca9865c - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 71fda41d - bug 2809 机场单位，新增人员页面不同用户应不能关联同一个账号（附图）
• 93c3c889 - 修改错误的取值方法
• 0a2d07bb - *）增加空值返回配置
• cb52528d - 隐患修改
• b16a9093 - 换执行方法
• 9ae27903 - 防火监督修改
• 3f2daf47 - 修改工作流执行权限校验的方法
• 8120623a - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• b3d54fff - BUG 2963 微型消防站,导入模板里面不应该有照片字段
• 06399247 - 2904 消防水源，导入导出模板中不应该有图片
• f47d4bde - 公众号前端获取签名
• 19f0436f - 隐患修改
• 68f6ef4e - Merge branch 'developer' into developer-latentDanger
• 2c2c48f8 - 修改接口
• 7666d4d0 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• cce69247 - 反馈保存接口
• a2c65bbd - 1.隐患相关-防火监督
• 34dfb7ce - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• c25e4999 - 测试
• 26ea6622 - item：修改防火监督审核流程
• e5f60853 - 提交重大事件和今日事件的统计
• b30b3383 - 公众号获取电梯信息
• ee042e9a - 提交修改
• 593e2ee1 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• c1cd94c4 - 1.修改依赖问题
• 8799c55f - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 43e70207 - 1.将公共的放到amos-boot-biz-common
• 3babee54 - 1.删除无用接口
• 7f2d4b65 - 2304 地址 联系人模糊查询缺失
• 306c46be - 增加机场现场配置文件
• ea90397b - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• ce863973 - 用户登录逻辑修改tzs 微信
• f8a67157 - Merge remote-tracking branch 'origin/developer' into developer
• e174c638 - item：添加防火监督接口权限注解
• f90a9366 - 修改数据库字段Type_desc长度
• 1888fe05 - 删除无用数据
• 11cac7ff - 去除依赖
• a445a124 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 598e1ee6 - 1.防火监督
• 0f51b4f2 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 63343ff3 - 修改bug
• 6a2c2221 - 1.联调修改，防火监督
• fd6d8867 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 59b93567 - 1.防火监督-隐患联调
• c89e4d85 - 1.防火监督联调
• 0ce5e1bf - 将assign的人设置为字符串数组的形式，来满足需求
• f73d4950 - 1联调修改-防火监督
• b4dbb2fa - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 74534dbc - 修改bug
• 6696783c - 添加两个获取当前登陆人可以执行的任务列表，已经执行的任务历史列表
• 1ac59eeb - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• fb87559f - 1.增加隐患删除-防火监督
• 387ed0ab - 修改bug
• 708e2717 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• a06e624c - 1.防火监督联调
• 6510191a - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 8214b40c - 隐患流程修改
• bfb2ab5b - 1.feign调用异常，增加抛出错误方信息
• a120f406 - 1.增加日期格式化
• 31968281 - 1.修改bug
• 2209124d - bug 2928 导出数据修改为文字 2547 地址和事件名双关联 2952 设施分类匹配
• f23b1ba8 - item：修改工作流更新计划状态
• 62658dd3 - 1.增加再启动
• 6513192c - 提交对于任务权限校验的方法
• 3bab2240 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 2c8d0e5b - 1.增加更新日期，再次审核流程
• 43cc2fe0 - 隐患流程修改
• 25977a48 - Merge branch 'developer' into developer-latentDanger
• b83a769b - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 8e2e6cc2 - 增加记录文件
• 626a82d0 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• a44c3271 - 隐患流程修改
• 3f2f2b86 - Merge branch 'developer' into developer-latentDanger
• 76b58245 - 隐患流程修改
• eb0b686f - 1.审核记录日志
• ee94709c - bug 2580 返回值改为具体名称
• 65eb87bd - bug 2882 判断是否为部门 如果部门底下有人员不可直接删除
• 8c78ce46 - 微信公众号相关功能提交
• 8ebb75cd - 修改查询历史操作节点的历史执行角色组的方法
• 46b624a5 - 隐患流程修改
• f66eb228 - Merge branch 'developer' into developer-latentDanger
• 51609e2a - 创建枚举值替换原有的字符串类型的key
• 45d38a63 - 1.修改人为机场人员
• 6dc4c21a - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d0e7a1ea - Merge branch 'developer' into developer-latentDanger
• d70ed6f9 - 修改figen
• 45f1a14d - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 4a1e6ce6 - 隐患审核修改
• 73207deb - Merge branch 'developer' into developer-latentDanger
• 5c2c5271 - 防火监督联调
• d488cfcd - 1.增加空判断
• 67dc3be9 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 03d62d00 - 修改错误的枚举值
• cca8a9b0 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 0d885881 - 隐患审核修改
• 16d3d4a8 - Merge branch 'developer' into developer-latentDanger
• e9ff571e - 故障报修维修记录 附件数据返回 bug2928 添加户籍，现居住地具体详情地址 字段 liquibase同步更新
• eb086901 - 修改bug
• 9a36750d - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 7e43ba41 - 公众号开发，地图接口开发
• 7275b6af - 1.隐患创建、更新、导入增加字段bizinfo
• 54a2dcd6 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 04c5f577 - 添加查询当前登录用户所能执行的所有任务列表
• bb5b0d31 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 21a00e83 - Bug 2931 联动单位，删除数据后左侧统计信息未更新
• 6107fda4 - 公众号开发，地图接口开发
• f34e8fdd - 更新tzs 相关代码
• c983317e - 修复bug
• 5ba7b5e3 - 防火监督联调
• c426fa09 - 修改权限筛选时出现指定角色为空的情况
• cbd3eb56 - 对是否有附件进行判断
• 369eece7 - bug 3026 【web】日常管理>机场单位，删除有级联数据的部门时，应无法直接删除
• 9f17a7a1 - 隐患工作流调试
• d36a3afc - Merge branch 'developer' into developer-latentDanger
• 655218a7 - 修改bug
• 924418b7 - 2407 【web】日常值班>警情记录>接警记录，表头排序功能失效
• 4847b0ad - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• a4ca7e7f - 故障报修 web 总条数返回
• 8d8aae60 - jackson long返回字符串配置提交
• a432cedb - 修改bug
• fc5787b8 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• ba84af37 - 修改bug
• 92d91934 - bug 3046 微型消防站，战备物资统计数缺失 xml语句中增加了对消防人员装备的查询
• bea0ba05 - 更新代码
• 23842b1d - 更新tzs
• be3c1a32 - 更新tzs
• 97d4e993 - 地图接口开发
• 0fdea5ff - 更新tzs
• ac182919 - Merge remote-tracking branch 'origin/developer' into developer
• b56f1577 - 更新tzs
• 06cef7da - 修改bug
• f04e98b3 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 60610c63 - 修改bug
• abdf4264 - 地图派遣人员推送
• f931ef1e - Merge remote-tracking branch 'origin/developer' into developer
• 0d55f2f8 - 更新电梯推送主屏接口
• 18616264 - 排序添加非null判断
• a5acef3a - 电梯物联信息接口
• c512f5e0 - 电梯物联信息
• 3e986dc4 - 隐患流程调试
• 359f4c40 - Merge branch 'developer' into developer-latentDanger
• ca5713f3 - 电梯物联信息接口，地图物联信息接口
• 4be025d2 - 修改bug
• c603b347 - 接警记录分页失效
• 661b0c4b - 修改bug
• c543af54 - 消防专家模板增添 籍贯 现居住地 获取地址对应code值的方法
• b3565dfd - 修改bug
• 0602640e - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 153f0f73 - 地图物联信息接口
• 06a1634a - 地图物联信息接口
• e9b6d2eb - 地图物联信息接口
• c74fab51 - 电梯物联信息接口
• e9043cc6 - 更新通知地址
• 4a6e9a07 - Merge remote-tracking branch 'origin/developer' into developer
• 7353f69e - 电梯物联信息接口
• dee359e1 - 防火监督联调
• 24f28ee0 - 1.格式化
• 9c226612 - 修改错误的参数取值
• 83d8231d - 添加微型消防站的excle导出魔板
• 7b79fbdf - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 084793d8 - 修改bug
• 1d1d1028 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• cf9b0baa - 新派遣通知
• 60b54653 - 地图消息接口
• 62c2076f - 地图消息接口
• 828eccd4 - 地图消息接口
• 06ff616b - 优化接口
• 3d523088 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• b8a109d1 - 增加注释
• 0d9374dd - 地图消息接口
• 6f65ce96 - 地图消息接口
• 44f5f2f9 - 修改bug
• 4d612c11 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• be5406dd - bug 2797 前端要求先改回code值。
• ee44a087 - 修改提交
• ef9a8f1e - 修改bug
• 6cbb86c3 - bug修改
• 35863f8a - 修改重点部位
• 5d5c492e - 修改
• 00fc0b7e - 地图电梯ES信息查询修改，装备导出模板字段数据接口
• 754e3145 - 修改bug
• c9b6dbbe - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• c223a9f0 - 修改bug
• 286425b8 - 地图电梯今日应急统计
• a3c17844 - 隐患列表修改
• 4b5b5d1c - Merge branch 'developer' into developer-latentDanger
• 9ce4235a - 修改提交
• 14625de4 - 地图电梯今日应急统计
• b0ac33cf - tzs 我的业务和关注电梯相关代码
• dafa7723 - 隐患列表修改
• 5bc42bc7 - Merge branch 'developer' into developer-latentDanger
• a200ce07 - *）修改前端分页参数传入为Long类型
• bc24b35a - 修改bug
• 1636d40b - 隐患提交
• 55a3ab17 - 查询参数修改
• bf0098e8 - 修改提交
• cae2c098 - 修改bug
• a04efc14 - Merge branch 'developer' into developer-latentDanger
• 3b103d22 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 73283447 - 修改bug
• f9170b2c - 修改巡检隐患表
• 1a3421b3 - 修改巡检隐患表
• 7ec739f7 - 日志文件名称修改
• 90e3008d - 修改bug
• dd430c63 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 424fed44 - TZS我的业务相关代码
• 4c1205ab - Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer
• 6c6be709 - 修改bug
• 0087739a - 完成微型消防站优化项的开发
• cb95bb00 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 1b73e96b - 添加自动获取当前登录人的方法
• e772e02e - 电梯物联信息查询优化
• e4889a2d - 修改bug
• 2f108f68 - 修改bug
• cb0838a0 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d1dd2f32 - 修复大屏相关接口
• 2c165567 - Merge remote-tracking branch 'origin/developer' into developer
• ffd06c9b - x修改代码
• bc3c95c7 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• b8bbe044 - bug修改
• f65b98a2 - Merge branch 'developer' into developer-latentDanger
• 554fa276 - bug修改
• b0cb1e3c - 检查项保存修改
• dc59bcea - 修改获取当前登录人的方法
• 4260c3bd - 修复APP接警类型
• 58bdaeda - 修改提交
• e16f7487 - Merge remote-tracking branch 'origin/developer' into developer
• a8b3b7e0 - 修改bug
• 2d4f83f6 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 7c4403bb - 查询事件记录添加主键
• 0389268e - Merge remote-tracking branch 'origin/developer' into developer
• 86de6925 - 隐患修改
• cb96f2af - 修复BUG
• db8637b8 - 修改隐患
• 8779785f - Merge branch 'developer' into developer-latentDanger
• e6a49c47 - 修改bug
• f0310916 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• f729bb77 - 添加电梯视频
• 37c3bbde - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 56e9ee09 - 修改配置文件
• ca8434b8 - Merge branch 'developer' into developer-latentDanger
• 49055fef - 配置错误修改
• 016b541c - 派遣添加救出冗余字段
• 2b809678 - Merge remote-tracking branch 'origin/developer' into developer
• e80c67ad - 地图警情处置流程信息接口修正
• 628fb1fe - 警情添加电梯相关信息
• b43628a3 - 修改bug
• 4c3f216b - 修改提交
• 4d5d2e8e - 修改bug
• 997f6f24 - 修改提交
• 5d398163 - 更新TZS代码
• edf6c1d6 - Merge remote-tracking branch 'origin/developer' into developer
• 90c4671a - 任务3857开发机场单位消防安全报告
• c73a85f8 - 任务3857开发机场单位消防安全报告
• ee92d854 - 任务3857开发机场单位消防安全报告
• 704398d5 - 地图ES搜索电梯修改,ES初始化电梯信息修改
• e92ba3ff - 修改bug
• 422decdb - 修改bug
• efe11080 - 修改提交
• 2ce01ec6 - 查看电梯时添加二维码
• 2ad3df88 - Merge remote-tracking branch 'origin/developer' into developer
• 3c764c3f - 公众号部分字段缺失修复
• b71c8cc6 - 修改bug
• ae451824 - 添加sql备用的数据项
• 1bcfacc5 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 0dd2d621 - 地图ES搜索电梯修改,ES初始化电梯信息修改
• ab7c7636 - 地图ES搜索电梯修改,ES初始化电梯信息修改
• d87545b6 - bug修改
• 7eddaafc - 修改bug
• d0f65e16 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 99099858 - 修改视图
• 6a217644 - bug修改
• 1b9cab77 - 同步修改关联账号用户名
• c806eb71 - 更新配置文件及派遣小程序反馈
• 8f513533 - Merge remote-tracking branch 'origin/developer' into developer
• f33df8f8 - 更新配置文件
• a4f5d6fd - 增加app接口
• 4d761ee9 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• b2bc73c6 - 提交开发车辆和微型消防站排班的月视图借口
• b1e78d84 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 362c85dd - 修改bug
• 2e4b2ab0 - 修改bug
• 9f19ead7 - 更新tzs 接警记录导出
• 8f3fd402 - Merge remote-tracking branch 'origin/developer' into developer
• e9c3a1cb - 修改bug 3128
• 257d6796 - 更新导出和公众号相关代码
• a047eb78 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d187f4d4 - 修改bug
• 62d9297b - 防火监督修复数据接口添加
• 4a1686c5 - 修改bug
• b2570fa1 - 修改bug
• cf712737 - 坐席端 点击到达 救援完成 矩阵更新
• 26bb3fad - Merge remote-tracking branch 'origin/developer' into developer
• fbe6db89 - 添加120急救站开发的代码
• df41994b - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d4e9c15b - 120急救站
• 1cebd933 - 修改bug
• ebf0f365 - 修复相似警情查找 及 警情任务结束mqtt 消息
• cd2b8bb0 - Merge remote-tracking branch 'origin/developer' into developer
• 086639f3 - 修改bug
• 4dd08c29 - 解决冲突
• 615ffa8b - BUG 3131 3130 3129
• c50a27fd - 电梯物联信息新增故障类型名称字段
• ae727340 - 应急单位左侧统计展示修改 无数据也展示 默认为0
• 437670cc - 修改bug
• 95a5ec19 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 4fe8716d - 修复BUG 更新从微信服务器下载资源接口
• 70bd8233 - 修改bug
• 40939e95 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 20e2a67e - 修改bug
• 9f4b6165 - 增加车辆任务状态改变
• d0559eb4 - 提交120急救站excle魔板下载和导出
• 3c1532be - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 9019dd78 - 提交120急救站的导入接口开发
• e1feb7f9 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• bf912395 - 修改120急救站的代码
• 95127744 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 723be421 - 修改bug
• b31c4b02 - 修改bug
• 84b7b527 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 18843a69 - 修改bug
• 54cc791e - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• de89af45 - 修改bug
• e127f546 - bug 2690 修改
• 4704a8c3 - 添加删除时的限制
• 6ef3f09b - 提交删除时的错误提示信息
• bd34f4a7 - 设置单位下没有120急救站时不显示当前部门在excle魔板中
• 83f73fe6 - 优化机场单位人员列表
• 4f383310 - 添加120急救站的岗位枚举字典数据
• f30399c7 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 225f97fb - 修改bug
• 8716c9e9 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d0d5945f - 增加救援模板
• 5daab4fe - 修改bug
• e6f5bd0d - 修改bug
• 8e599815 - 修改bug
• 2418c2e4 - 增加app 接口
• 49704280 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• aeca182c - 添加了 消防专家、机场单位人员的excle导出数据帅选
• d2f1c42b - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 5229ecbc - 维保单位接口修改
• a6d88dfb - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 561a1f05 - 添加消防人员的excle导出数据帅选
• 0354406e - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• c028d967 - 更新tzs 优化项
• 2c0e24f4 - tzs 处置记录导出
• ff160a5f - 修改bug
• 9d20e7f9 - Merge remote-tracking branch 'origin/developer' into developer
• 9f011e61 - 提交消防队伍的excle数据帅选功能
• cdf8c9f7 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 9d0fb5a9 - bug修改
• c85b0e72 - 修改bug 增加消防站战备人员查询
• d8234bd3 - 工作流节点执行角色匹配修改
• 7dd93159 - 修改app接口
• eea81ea2 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• a8782d3d - 修改bug
• 8222c978 - bug 2613 增添 39-40行 倒序条件
• 5a0c92e4 - 维保人员和微型消防站Excle 刷选数据
• fbf969b9 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• c69b2d49 - 增加任务备注
• b51b4771 - 提交微型消防站导出的EXCLE数据筛选代码错误
• 1ff823de - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• c7f6ab98 - 隐患列表添加权限过滤
• 40dff48f - 微型消防站报错
• 17e7cde4 - 修改计划生成
• d11c4694 - 修改bug
• 2894ce0f - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• f43f4851 - 修改bug
• 63c98e27 - 修改bug
• eae33010 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• a2a48d3d - 隐患修改
• 0b68d6eb - tzs 更新
• 54a328e5 - Merge remote-tracking branch 'origin/developer' into developer
• 74f0f25c - 航空器,重点部位，消防水源，危化品导出增加过滤
• fdba34c3 - 增加app接口
• 8b324ca9 - 修改bug
• e862fc69 - 更新tzs
• 821169f2 - Merge remote-tracking branch 'origin/developer' into developer
• 206f4c60 - 根据机场单位人员id批量获取对应amos平台账号id
• f92e469d - bug修改
• cfed33b1 - 解决bug:3114
• dc51dd32 - 删除语法的sql的方法
• 3dff6727 - 修改bug
• 7c5b3e67 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 76a13fd7 - 修改bug
• 0b9ff18c - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 2f8f02c3 - 修改bug 2912
• ed6d59af - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 79a832a1 - bug修改
• da4759bb - *）生成计划任务增加消息推送
• fcae2139 - 修改bug
• 7a7b97eb - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 68fbc881 - 修改bug
• 7e3974a5 - 修改bug
• ac568d5f - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 64ae60e7 - 修改bug
• d7d08e65 - 我的业务经纬度
• 64f32ae8 - 修改bug
• f0406f68 - 更新到达时间
• bafa05be - Merge remote-tracking branch 'origin/developer' into developer
• 424c441f - 联动单位导出增加过滤
• 57327195 - 修改bug
• afff64eb - 修改bug
• 36e1b0d1 - 隐患配置文件修改：添加video服务feign名称
• 67fad3d9 - 隐患配置文件修改
• 0fa59747 - *）修改分页参数
• 9024e252 - 联动单位导出增加过滤
• 58228d9b - 修改消防队伍模糊查询excle导出失败
• 9cb2b329 - 联动单位导出增加过滤
• db2e3734 - 联动单位导出增加过滤
• 7fc8005b - bug 3268
• 02585c32 - 修改bug
• 0158d112 - 修改bug
• 5865573d - 修改bug
• 6212b9e9 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 8c0e9fb8 - 隐患统计接口
• ed6bea33 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 444cbe9e - 修改bug
• 31f912e3 - 修改bug
• fb7a77a0 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• a60c5184 - 1002 APP首页优化--领导角色
• d7bfd441 - 提交配置文件修改
• f503fe7e - 修改bug
• 15e08926 - item：修改维保公司父级ID为空默认返回
• 9ab93653 - 修改bug
• c1f70781 - 修改上传文件时同步响应等待时间太长的问题
• 64f98882 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 866767c1 - 修改bug
• 59f742c4 - 任务 4155
• 0e402daf - 修改脚本
• 7808ce1a - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• dbabb8ff - 修改bug
• d4aa92c2 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• ad77ba58 - 119优化项
• abbd92de - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 0ebeaf8f - 修改脚本
• 6ada879d - 更新tzs导出相关代码
• 3149c8d4 - Merge remote-tracking branch 'origin/developer' into developer
• 7acc0801 - 修改bug
• 7a22eb43 - 修改脚本
• 48d35d88 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d1acb62b - tzs 更新其他fegin 配置
• 9b406bba - Merge remote-tracking branch 'origin/developer' into developer
• 28f4d7fe - 修改视频地址
• 3ffcbb63 - 添加119优化项 利用定时器更新联系人和重点部位模糊查询
• dafe3293 - 删除不需要的请求参数
• 9be641f7 - 修改bug
• a2a95f29 - 修改bug
• bef6a06d - tzs 导出优化
• 29a85105 - Merge remote-tracking branch 'origin/developer' into developer
• 0a6680f8 - tzs 导出优化
• 6c90ecf5 - 修改bug
• 7c1fe64d - 任务 4174 日常值班---融合调度----短信模版中的内容用户可以全部删除掉，按照自定义内容重新录入发送内容
• 7621d26a - 修改联系人的方法，以及获取地址方法，删除对于的定时器
• 16f48876 - 更新 救援站导出
• 4275dffd - Merge remote-tracking branch 'origin/developer' into developer
• 63e203b9 - 修改bug
• 3423fc85 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 9e872afd - 修改bug
• d8ee8871 - 修改获取联系人sql语句的方式
• 1e68e16e - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 0e747853 - 修改bug
• 488f71da - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 7e3a8fca - 1、隐患bug修改
• 8a80f977 - bug修改
• af7dbd8f - 隐患执行角色优化
• 9d1a8805 - 修改
• 39c6a8f1 - tzs 电梯信息优化项
• bf87e185 - Merge remote-tracking branch 'origin/developer' into developer
• 3b42e7bd - app 告警统计跳转数据接口
• d8e8913b - 修改bug
• a1ef59e2 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 80f9a141 - 修改电梯没有分类报错问题
• 135c2d9c - 修改bug
• faf60848 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 8e3d3463 - 移除多余的null
• 8b89e58f - 修改bug
• 64663fd6 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 8d011bcc - BUG 3312 3340
• 970cc4a0 - 更改联系人的数据帅选
• d562be7b - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 6e4128a9 - 修改bug
• 6d6047dd - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• df78c66e - 添加119优化项获取重点部位模糊名称时的公司id查询条件
• 48937377 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 2f020bf1 - 增加非空判断
• 8d7301e3 - 当天车辆排班的次数
• e8ae0f64 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• c21a500e - 删除对于的对外接口
• acae44b5 - *）消防监督流程发送消息
• daf27b76 - item：修改获取用户信息属性查询
• 0bade3d2 - 修改bug
• 93524619 - 修改bug
• f9f8ccb1 - 添加119警情填报中的物联报警和语言融合报警的字典值
• 528e6788 - *）增加隐患消息
• 9e654c31 - *）修改推送时间
• 20928b0f - 修改bug
• 21e893de - 修改bug
• d7c7991a - 修改bug
• 70e87bb8 - 修改bug
• 5333e2a0 - tzs 地图相关功能更新
• 0c831aa9 - Merge remote-tracking branch 'origin/developer' into developer
• 7c98d32b - BUG 3073
• e7b79f8c - 修改bug
• f02a9e65 - *）修改消防监督消息
• d0996f4f - 接警记录补充条件
• 8ed284d0 - *）修改消息提示
• cc72759d - *）修改中文分号
• 6182e195 - tzs 更新通话
• 53a10a5f - Merge remote-tracking branch 'origin/developer' into developer
• 479efe2d - *）增加消息展示字段
• ae201c65 - 巡检点优化项提交
• 6efedc40 - *）增加审核结果展示
• df699c7d - 提交对于数据库的修改
• 722bf94a - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 0b0549c0 - 添加维保防火监督消息推送
• 22d4bc25 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 0a08b18e - 添加消息推送web
• 2220b979 - conmit
• 0ec49a2c - tzs 录音列表及区域树
• be46a8ae - Merge remote-tracking branch 'origin/developer' into developer
• 0c0820a2 - tzs 更新
• 06ad7844 - 修改bug
• b3dab61c - 防火监督报告提交
• 59c376ad - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 40c00e9b - 任务 4263 4264
• 9cddc1c9 - 任务 4263 4264
• 53929b76 - 修改bug
• d0a011c5 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 37c447e5 - 通话记录相关功能完善
• 5eec06ef - Merge remote-tracking branch 'origin/developer' into developer
• 0cee0c4d - 修改bug
• 75e16b2e - 任务 4250
• e38ec83e - 修改bug
• abec41b1 - 力量调派详情弹出
• a1915903 - 添加对于消防队伍数据库表字段添加的sql脚本
• fc236903 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 9f24cc09 - 提交树信息改造
• a8e79b14 - 修改poi引用版本4.0.1
• 3ffa5dbf - 巡检隐患审核修改
• 35ee00c5 - 检查报告接口修改
• 4cb4dd30 - 添加偶然性数据为空导致的问题
• ba307b78 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 9b7f7b21 - 特种设备ES 搜索优化
• 95455d43 - Merge remote-tracking branch 'origin/developer' into developer
• 593cb454 - 删除并行流
• c4cb658d - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• cfebdc75 - 修改bug
• dfdfb3e8 - bug修改
• b0551ad2 - bug修改
• f1a3f0fd - bug修改
• f2968d1e - 添加liquibase
• 5079c387 - Merge remote-tracking branch 'origin/developer' into developer

Compare with previous version

added 435 commits

• c928122e - 修改特种设备es 接口
• b9aa8008 - 修改隐患消息发送
• 0b84614b - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 2fc0d704 - 修改特种设备es 接口
• 80ac3fea - Merge remote-tracking branch 'origin/developer' into developer
• 129de41f - 修改特种设备es 接口
• 03eac21c - 1.换流站消防管控中心平台后端初始化
• bce31e8c - 更新changelog
• 21c55b94 - Merge remote-tracking branch 'origin/developer' into developer
• f15e4593 - *）增加隐患列表筛选条件
• db24cc45 - 更新通话记录相关内容
• eca59248 - 1.首页接口
• 2979a0b3 - 规则配置 查询接口
• 3c0849de - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• c532a775 - 任务 4304
• 89f4297f - 警情状态展示字段
• 42dc05fa - Merge remote-tracking branch 'origin/developer' into developer
• 7eb791a5 - 1.资源接口
• bc139943 - 1.资源接口
• efa3d440 - 修改bug
• 2e67c060 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 46d758d3 - 修改bug
• d40a9dba - 警情日志创建完以后清理redis 缓存
• b21e3174 - Merge remote-tracking branch 'origin/developer' into developer
• f6a5c449 - 调派规则
• 8f58234e - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d40296b0 - 创建全寿期安全监管系统代码tzs.flc包下
• 9fd75ac4 - 解决代码冲突
• 59953bc0 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 7f0bd1ab - 添加扫描mapper文件路径
• 48e7bc77 - 增加调派规则调用
• c9e9d436 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 0891565c - 修改类名
• c4158d0d - 添加扫描mapper文件路径
• 0041a807 - 1.安全态势接口
• 18d2a124 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 5db5e659 - 1.修改初始化脚本
• 720151cb - *）防火监督改为规则发送消息
• a13be602 - *）增加检查项完成调用规则
• ca6b565f - 提交实体类更改
• 0f341cc9 - 提交代码
• 3eec8871 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 1f5f15be - 屏蔽还没开发完的代码块
• 82d5e313 - 修改用户名
• c6f34763 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 68b7e93d - 提交代码
• ca609bb3 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• f64380e8 - 融合调度规则 任务 4318 4326 4327
• bcde67be - 和代码
• 12c85eba - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 592489d7 - 恢复方便测试的代码块
• 5f1cd588 - 修改bug
• 628b9f41 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d46829d0 - 消防巡查隐患优化-指定隐患治理人
• da364e6d - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 79c28b42 - *）公共包增加通用消息规则触发动作方法
• f7500147 - *）修改巡检地点字段拼接
• 815f366c - 修改bug
• 4fcf9ab9 - 修改bug
• d70702a5 - 修改bug
• 33075ceb - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 2e4b1523 - 修改bug
• b09be264 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 3773f814 - 消防巡查隐患优化-指定治理人
• e3437e01 - *）修改消息推送功能到公共模块
• 7968d8f8 - 消防巡查隐患优化-指定治理人
• 8f0ac50d - patrol服务添加配置文件属性
• ca3b5fac - 融合调度规则 任务 4318 4326 4327
• f190a9a3 - *）修改实体
• 573b95c2 - 修改bug
• 8d67919c - 1.调整表名，告警->信号
• 6b8a1fab - 修改bug
• ec4b5184 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 8409ca89 - 修改bug
• 55d23f0e - *）增加计划审核完成方法
• a4d959a9 - *）删除依赖
• 07969554 - 修改消防巡查消息推送
• cb47ecc3 - 1.ccs 物联监控
• 379ac1ea - 1.ccs换流站详情
• 5dc3a363 - 1.消防物联
• f867bae5 - 1.ccs-风险态势 接口
• 182fe054 - *）增加JSON空值显示
• 4548321e - 更新FLC相关代码
• ebb9d743 - 更新FLC相关代码
• a705411a - Merge remote-tracking branch 'origin/developer' into developer
• 232f51e4 - *）修改防火监督消息
• 47328796 - *）升级amos-feign-systemctl
• dea4a31a - 更新FLC相关代码
• dc5701dc - Merge remote-tracking branch 'origin/developer' into developer
• 6fc9dfc9 - 更新FLC相关代码
• 5820f517 - 修改bug
• eb28cd4a - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 43fd22c5 - 更新FLC相关代码
• 675a52c3 - Merge remote-tracking branch 'origin/developer' into developer
• 6b2584cf - 融合调度规则 任务 4318 4326 4327
• b5bdce97 - *）修改版本
• 13284bdc - 提交力量调派任务发送
• a0c72061 - 更新FLC相关代码
• 82c47d75 - Merge remote-tracking branch 'origin/developer' into developer
• 258a08e1 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 7842725c - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 633446fe - 放开方便测试的代码逻辑
• 4599f732 - 融合调度规则 任务 4318 4326 4327
• 04568a53 - 修改bug
• b39ecc9a - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 877b3e6c - 融合调度规则 任务 4318 4326 4327
• 22cfe9a5 - *）修改二次审核跳转页面
• aa3f8237 - 提交額外的判斷
• afe94ac5 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 5cb44c11 - 融合调度规则 任务 4318 4326 4327
• 4e79a6b6 - 修改bug
• 4034a926 - 修改bug
• 3db714ef - 修改bug
• 038c70a7 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• a6734d86 - 修改bug
• d0c84abd - ES 放电梯数据
• 25c8b61c - Merge remote-tracking branch 'origin/developer' into developer
• 471ef949 - 添加APP待办任务统计
• 7656d9cb - Merge remote-tracking branch 'origin/developer' into developer
• 8af34682 - *）增加消息常量
• c1b8b623 - *）修改隐患uid
• 66b170da - 添加APP待办任务统计
• 39c48d75 - Merge remote-tracking branch 'origin/developer' into developer
• ca675683 - 修改bug
• abfcd8ba - 提交警情消息推送的ro
• 414f84bc - 添加巡检消息推送类别
• 990bce1b - Merge remote-tracking branch 'origin/developer' into developer
• 445c198b - *）修改枚举
• b6685aaf - 提交企业变更 及 变更审核逻辑代码
• 9bb1742a - 提交消息发送的代码
• 2bd57061 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 619d5fee - 提交信息发送的代码
• 3aa718f4 - 放开方便测试屏蔽掉的逻辑代码块
• c86d08b4 - 修改bug
• 2554f748 - 添加跳转的路径
• db8cdec7 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 79b73a8e - 全寿期生成代码；
• 824905ae - 全寿期人员相关sql 脚本
• 041f79d2 - 更新sql 脚本
• 1c44822a - 迭代6 1090 融合调度消息发送
• 61375970 - 隐患bug修改
• fd1168c3 - 迭代6 1090 融合调度消息发送
• 702d15b6 - 迭代6 1090 融合调度消息发送
• 79354e8e - 修改bug
• daf014f9 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 3670e0c2 - 修改隐患服务包名错误
• 011e752d - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• f5ce30a1 - 修改bug
• b07ae56a - 修改bug
• fc5dc020 - 巡检bug修改
• 95a17425 - 事发单位接口修改
• 54c4ee3e - 更新FLC 企业人员添加相关接口
• 581f836f - 修改bug
• d3f37a65 - 动态枚举修改
• 7a3f199b - 修改bug
• fa7c814a - 企业人员列表 带分页搜索
• 5c6a3ac0 - 提交对于消防队伍和消防人的接口
• f63d2e82 - 任务 4457
• 8ff0bcd2 - *）增加调用融合终端接口
• 3facd96f - *）修改融合终端接口
• 4c98ebdc - 任务 4457
• 285eade3 - 添加查询所有消防人员的分页接口
• cbd21106 - tzs-设备相关表创建
• 62d37c8d - 修改
• f5df4d7d - FLC 企业人员相关代码
• 6fe14bff - *）修改后端
• 8fe4868d - *）修改问题
• a0c3110f - *）修改报错
• d945ba06 - *）修改车库门控制
• 2454630f - *）修改feign启动参数错误
• bddb2076 - *）修改警铃车库门一键控制
• 95c60ba6 - FLC 监管端人员更新接口
• 308cfa95 - *）配置文件增加调用融合终端接口url
• 49c4b9d7 - 1.sql错误-ccs
• 1afe21cd - 提交获取所有消防人员方法的额修改
• f731acde - 消防监督报告bug修改
• c92cfa72 - 预案接口添加验证权限
• 74ea674a - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 54766f8a - 添加阿里云音频识别demo
• 380a87d9 - 添加阿里云音频识别demo
• 61bb0dc2 - *）增加确警实体类
• 5466a93e - 添加阿里云音频识别demo
• e139997b - Merge remote-tracking branch 'origin/developer' into developer
• ab53e9c8 - 巡检SQL修改提交
• f192af07 - 添加阿里云音频识别demo
• 1ce9c1f3 - 添加阿里云音频识别demo
• da3aa95c - Merge remote-tracking branch 'origin/developer' into developer
• 8c96d81b - 添加阿里云音频识别demo
• e033264c - 添加阿里云音频识别demo
• dde28218 - 作战指挥处置记录预览
• 34994fb4 - *）增加修改接口
• 2ca6c409 - 添加APP接口 警情通话录音文件地址字段
• 12c85dcf - 作战指挥处置记录预览
• f36e247b - Merge remote-tracking branch 'origin/developer' into developer
• 5dddeb66 - 作战指挥处置记录预览
• 8d40c510 - 修改阿里云音频识别demo
• 2b014717 - Merge remote-tracking branch 'origin/developer' into developer
• 49f3d7e2 - 巡检点app查询bug
• 2828b1ad - 更改获取所有消防人员的方法，添加年龄的显示
• a28664c7 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• b1bdd1a2 - 添加阿里云音频识别接口
• 93c68329 - *）增加语音融合返回判断
• 8f276b49 - 检查报告无法下载
• 124397e2 - 修改获取消防队伍中树信息展示没有数据的问题
• 451f75d9 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 6b97070d - Merge remote-tracking branch 'origin/developer' into developer
• 170a9b63 - 修改代码
• 761b7096 - 更新计划不更新创建时间
• b52afe30 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d82751ae - Merge remote-tracking branch 'origin/developer' into developer
• 5ebb50c4 - 添加阿里云音频识别接口
• f628f8db - 添加阿里云音频识别接口
• f17dbfbf - 添加阿里云音频识别接口
• 01306688 - BUG 3817 3815 3809
• 4a05d302 - 添加阿里云音频识别接口
• 0f863dff - Merge remote-tracking branch 'origin/developer' into developer
• 80fb513b - *）指令流增加接警录音
• 19d62586 - 提交非Null判断
• d083e445 - 添加阿里云音频识别接口
• 84476512 - *）修改序列化id
• 41b73c5a - 提交组装树的时候错误的判断
• 0ffa70b4 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 14388ae0 - 提交组装树信息时的判断
• d8f60ec0 - 修改语音识别功能
• ff71058c - Merge remote-tracking branch 'origin/developer' into developer
• 0bc54db0 - 修改sql 展没有的字段值
• aabb153f - *）通话记录增加时间倒序
• 190e7c25 - *）修改排序
• fa86f636 - linux 下生成word文件保存解决
• 21ddf9e2 - *）修改巡检标识
• 1d1ca8ae - 设备相关接口
• 1b34c82b - 设备列表查询接口
• 285cb763 - 1.应急处置
• cd4b3fbc - bug
• c6fd0660 - bug 3808
• fedaa2aa - 修改bug
• 8dd434f5 - 视频地址实时获取
• 9d2fdbaf - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• ee23cfb0 - *）增加调用规则验证信息
• e603a057 - 1.css 接口修改
• 2e7a6dca - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 2606a927 - 1.删除不用代码
• 002e6efd - 车库门、警铃、广播的 联动
• 128443da - Merge remote-tracking branch 'origin/developer' into developer
• 46f970df - 维护数据库
• 45308987 - 提交关于预案匹配的后端接口
• e7c5102f - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 9f2a896d - 设备列表接口更新
• d786607a - bug 3871 3817
• fd5dd490 - *）增加检查组长审核跳转页面
• abd18c67 - 1.修改隐患返回的lng lag为隐患的位置信息
• c8da209c - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 190ea23f - 去除异步
• 285485f2 - bug 3532
• 9e69602b - bug 3607 事发单位es存储加校验
• 41aed6bc - 公共类添加知识库feign
• 6d514abb - Merge remote-tracking branch 'origin/developer' into developer
• 0a7f8a77 - 修改bug
• 6a91ff13 - 1.冗余字段
• 35b58fb4 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d21c49d5 - 视频监控
• 52869a15 - 设备添加 查询添加设备所属单位字段 监管端人员新增相关接口
• c1b34cfb - Merge remote-tracking branch 'origin/developer' into developer
• cc9486af - 修改装备的figen 请求详情时的装备id 必填项的问题
• 55ae4ef2 - 添加为非必填
• 74414307 - 1.增加查询关联的摄像头接口-ccs
• 3a627f10 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• b8432f04 - 1.增加消防设备mrid-ccs
• a2914709 - 1.消防车辆信息列表
• cca3a873 - 1.修改方法名称
• 8c791a40 - ccs 关联摄像头分页查询
• 17594117 - 增加确定接口
• 3e29a34c - 1.增加建筑id -ccs
• f479b810 - 电力中心管控平台应急指挥相关接口开发
• 9d4ad27d - 解决冲突
• 73e73e2f - 修改bug
• 79e01b8b - 修改电力管控平台电力设备实体类属性映射
• c96555c1 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 227f6697 - 添加警情预案的消息推送
• cb2b3e16 - 修改bug
• 1cf85534 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• b3ea41f3 - 破解跑道liqiubase字段修正
• 6e6c35c8 - 修改bug
• b4939220 - 修改航空器 详情
• 9d1782db - *）新增根据用户id查询人员接口
• 7a551c95 - 提交预案匹配的异步方式
• da0d7eeb - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• ec3dbec9 - 修改获取匹配预案的错误日志方式
• 44d7aae5 - 删除控制台的日志输出
• 0e7f74fb - 先关掉异步
• f7050a53 - 破解跑道liqiubase字段修正
• 0d7d9a5a - 解决方法内添加异步注解导致循环引用的问题
• 30aacaad - 修該bug
• 94cb5138 - 修改bug
• d38b57da - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 21c96c6e - 3817 bug
• 1f84b6a7 - 添加根据amos userid模糊匹配获取对应机场单位人员信息列表 接口
• f7a3dabc - 修改bug 3878
• d76816b7 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 2f2703cc - 添加机场人员列表信息帅选时的amosid 的条件
• 9325c941 - 修改bug
• 77bf68fd - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 32a380b3 - 企业人员更新问题修改，配套设备相关接口
• 56cbed9e - 3918 3917 3910 bug
• 64094e18 - Merge branch 'developer' of http://e7ypyu8.nat.ipyingshe.com/moa/amos-boot-biz into developer
• 6ba8a7fd - 对接语音数据
• 1df592b9 - Merge remote-tracking branch 'origin/developer' into developer
• 97f7b070 - 修改bug
• 9e4f4f3c - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• cc2a7a4b - 提交添加amosorgid 的模糊查询匹配项
• 69b19ec5 - 防火监督权限修改
• c8d3a4c6 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d8e81dd9 - 3933 bug
• cec35b98 - 警情推送
• 587fc256 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• a7e5603e - 对接语音数据
• 0a43d10f - Merge remote-tracking branch 'origin/developer' into developer
• 1b56fc4c - 调教获取维保账号是否被绑定使用的权限
• 39e50612 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• eb2a8ce2 - 对讲监听
• c5bf7cd2 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 530283ec - 对接语音数据
• dd4a552c - Merge remote-tracking branch 'origin/developer' into developer
• 018f8e6c - 增加车辆随车人员
• 949022bd - 对接语音数据
• 33f0f67f - Merge remote-tracking branch 'origin/developer' into developer
• 40c750b9 - 对接语音数据
• 163597e3 - 新增装备工程
• bfe763c3 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• ece65294 - 新增装备工程
• f8c0f7ce - 1.版本依赖
• e34cab75 - *）修改更新告警日志表
• b4405a5f - 1.修改execution
• 1d949d54 - 修改bug
• e4d0802b - 提交重点部位获取建筑下重点部位列表的sql
• d2ef0602 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 112a9750 - 对接语音数据
• a9d912ce - Merge remote-tracking branch 'origin/developer' into developer
• 5d6ff773 - 提交对于重点部位接口中查询建筑下的部位信息的详情字段值
• c94a4397 - 增加验证接口
• 9a9ab940 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 6ee20e2f - 新增唯一判断
• 4cde68d2 - 1.修改更新报错metaHander
• 9597e8c9 - 增加app 我的相关警情
• 367d5863 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 5472302d - 修改Bug 隐患治理消息通知中存在null 的问题
• 8f343ab5 - 修改巡检计划执行人树同一节点人员重复
• e23359b8 - 修改隐患级别下拉枚举值重复的问题
• 55ac42f1 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 1b48627c - 1.删除无用代码
• 77d5b908 - metahandler修改
• 39c1ec61 - 修改bug 3965
• 8e387215 - 优化联动控制逻辑
• a0f9f69f - Merge remote-tracking branch 'origin/developer' into developer
• 97d116aa - metahandler修改
• 62cfc63d - 修改bug
• ce84d7a6 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 3350d07b - 修改接口参数
• d94bc6c1 - 3963 bug 3532 3858
• cb98676c - *）修改方法名
• 70ed9d94 - 警情报送事发单位保存进ES 查询时加去重
• 608886ee - 优化组态图设备状态查询接口
• ba76251f - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 9f9b5b04 - 替换文件
• a9e96996 - *）调整视频轮询分页查询
• 326b0b57 - 修改报警列表及确警框报警列表时间格式
• 8e1ad251 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 50cc60f1 - 值班模板模板导出接口传参修改
• 82346463 - 修改值显示bug
• aaaad40a - 修改bug
• 08f2bb10 - 警情删除跳转
• 0f7d15f8 - 修改bug
• 11eaf58c - 修改bug 4003
• e239b1e5 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 5a783796 - 修改bug
• 3fc8da02 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• cb87ce50 - 修改bug
• 45984b98 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• c504e355 - 修改bug 4003
• b04a3b3e - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d668cc89 - 修改bug
• b84b047b - 修改过滤条件
• bb8b5e4d - 气瓶相关接口及人员接口修正
• b9d122eb - Merge branch 'developer' of http://e7ypyu8.nat.ipyingshe.com/moa/amos-boot-biz into developer
• 6509feee - *）修改视频视图查询
• 9ec59555 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 0c458175 - 添加当警情信息不存在时空指针的问题
• f88215b7 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 893396f0 - 修改bug
• a5d72040 - 修改bug
• 0932279d - 警情填报事发单位去重
• 98682aea - 提交误改的代码
• c055e8de - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• f2973ca2 - bug 3532
• 9bfead0a - 修改版本号
• a50bcd0b - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• e8449fa1 - 优化
• cd760c5a - Merge remote-tracking branch 'origin/developer' into developer
• 647b6f2b - 增加 重点部位 单位筛选
• 601597d3 - 提交消防装备帅选条件-----所在位置
• 10b6f117 - 告知申请单部分接口
• f45bde86 - Merge branch 'developer' of http://e7ypyu8.nat.ipyingshe.com/moa/amos-boot-biz into developer
• f16c54eb - *）修改确警
• 8f6d1ed9 - 修改告警导出和集成后手机端接口调用问题
• 8593afa9 - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• d505f2fd - item：修改getPointData-xml中视频点isBinding判断条件
• 3078e08a - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 35ba3b18 - 修改bug
• 6a26a690 - 合并MultipartSupportConfig
• 7cdbdf0d - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 89c6cb1b - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 5cbc447f - 修改bug
• 29ac9ad7 - 修改bug
• eae3956e - 修改bug
• ab4225e3 - 增加筛选条件
• c984a548 - 1.新增3维功能
• addcc33c - swagger包扫描过程
• 19ffc95c - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 88c3a58b - 设备接口调整 新增告知书-设备相关接口
• a548c586 - Merge branch 'developer' of http://e7ypyu8.nat.ipyingshe.com/moa/amos-boot-biz into developer
• 808de20a - 修改点位图视频相关接口
• 1895d51c - Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer
• 5f90a786 - 修改bug
• f49cb238 - 修改bug
• 38334cf9 - 修改bug
• ffa26fd0 - 修改bug
• a7984014 - 修改bug
• 6eadb145 - item：修改移动端登录bug
• 669022be - 更新告知书相关接口
• df5e85dc - Merge branch 'developer' of http://e7ypyu8.nat.ipyingshe.com/moa/amos-boot-biz into developer
• 004861d4 - 提交消防队伍controller和serviceimpl 的代码移动到common包下
• 4a4ac636 - 添加副屏视频随主屏警情切换进行联动
• 1cd43584 - Merge remote-tracking branch 'origin/developer' into developer
• a2995816 - 1.维保公司修改
• a550ce2d - 1、防火监督隐患bug修改

Compare with previous version

closed