Commits · daf5c9809d474c88b5edabe62203a238cd02d900 · 项目统一框架 / amos-boot-biz · GitLab

08 Sep, 2021 3 commits
- 联动单位列表按时间倒叙排列add order by clu.rec_date desc 同时处理单位根节点-1时查询全部数据问题 2021-09-08 by kongfm · daf5c980
  kongfm authored Sep 08, 2021
  
  daf5c980
- 消防队员列表按时间倒叙排列add desc 2021-09-08 by kongfm · 5912bc13
  kongfm authored Sep 08, 2021
  
  5912bc13
- 消防队伍列表按时间倒叙排列order by x.rec_date desc 2021-09-08 by kongfm · f42c41af
  kongfm authored Sep 08, 2021
  
  f42c41af
07 Sep, 2021 1 commit
- bug2407 筛选参数解析异常修改筛选条件方法 XML中添加了selectAllPage 方法 data代表排序条件 lift 升降序 · 6393d661
  chenzhao authored Sep 07, 2021
  
  6393d661
03 Sep, 2021 12 commits
- Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao · 6afdeaa8
  chenzhao authored Sep 03, 2021
  
  6afdeaa8
- Bug 2647 编辑用户所属单位后按单位筛选人员结果错误增加了 638 639 两行代码根据修改的部门调整部门code · 6fab1d04
  chenzhao authored Sep 03, 2021
  
  6fab1d04
- bug2407 筛选参数解析异常修改筛选条件方法 XML中添加了selectAllPage 方法 data代表排序条件 lift 升降序 · 8ae87a00
  chenzhao authored Sep 03, 2021
  
  8ae87a00
- 修改bug 人員崗位和學歷多次保存的問題 · c0c7fe10
  chenhao authored Sep 03, 2021
  
  c0c7fe10
- Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao · 8a7cc9ed
  chenhao authored Sep 03, 2021
  
  8a7cc9ed
- 修改bug2698 · d9666f9e
  chenhao authored Sep 03, 2021
  
  d9666f9e
- Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao · 5d1ba33a
  chenzhao authored Sep 03, 2021
  
  5d1ba33a
- Bug2407 表头排序失效 xml中添加了排序条件 · 120283b9
  chenzhao authored Sep 03, 2021
  
  120283b9
- Merge branch 'developer' into chenhao · cd064445
  chenhao authored Sep 03, 2021
  
  cd064445
- Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer · 07c87669
  suhuiguang authored Sep 03, 2021
  
  07c87669
- 1.增加liubase字段 -维保 · 56da70dd
  suhuiguang authored Sep 03, 2021
  
  56da70dd
- item：liquibase巡检脚本维护 · a7995fc0
  高建强 authored Sep 03, 2021
  
  a7995fc0
02 Sep, 2021 13 commits
- 1.装备水源id查询维保记录 · bb2ab374
  suhuiguang authored Sep 02, 2021
  
  bb2ab374
- 修改机场单位下重点部位的统计sql · 53f127a7
  chenhao authored Sep 02, 2021
  
  53f127a7
- 1.redis先修改为不同,原因两边序列化方式不一致 · 5cfc86f6
  suhuiguang authored Sep 02, 2021
```
2.pom 依赖库整理
3.巡检app升级bug修改
```
  5cfc86f6
- BUG 2670 · a9fd265c
  李腾威 authored Sep 02, 2021
  
  a9fd265c
- Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer · 39756c60
  chenhao authored Sep 02, 2021
  
  39756c60
- 添加数据库吧表的修改，对于经纬度的精确度修改 · 9e000e5c
  chenhao authored Sep 02, 2021
  
  9e000e5c
- 任务 3488 BUG 2193 · eadf7bde
  李腾威 authored Sep 02, 2021
  
  eadf7bde
- Merge branch 'chenhao' into developer · c2738cd5
  chenhao authored Sep 02, 2021
  
  c2738cd5
- Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer · 24261721
  suhuiguang authored Sep 02, 2021
  
  24261721
- 1.reginParam key 修改为："region_" + userId + "_" + token · 719a3305
  suhuiguang authored Sep 02, 2021
```
2.巡检localDateTime 序列化修改，返回时间戳
```
  719a3305
- Merge remote-tracking branch 'origin/developer' into developer · 04b154bf
  kongfm authored Sep 02, 2021
  
  04b154bf
- 修复bug2684 · 0c71edac
  kongfm authored Sep 02, 2021
  
  0c71edac
- 修改Bug 2701 按人名/专家领域筛选失效修改xml中Sql语句 · ce9c45b8
  chenzhao authored Sep 02, 2021
  
  ce9c45b8
01 Sep, 2021 11 commits
- liquibase 修改 · f42bd835
  tianbo authored Sep 01, 2021
  
  f42bd835
- 任务脚本修改 · 3ae98e3c
  李腾威 authored Sep 01, 2021
  
  3ae98e3c
- 任务脚本修改 · 8d10706b
  李腾威 authored Sep 01, 2021
  
  8d10706b
- 任务脚本错误退回 · ac266ebb
  李腾威 authored Sep 01, 2021
  
  ac266ebb
- Merge remote-tracking branch 'origin/developer' into developer · d472496a
  kongfm authored Sep 01, 2021
  
  d472496a
- 任务3527 重点部位导出模板 id name 未正常配置 by kongfm · a885ba24
  kongfm authored Sep 01, 2021
  
  a885ba24
- Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer · fa926297
  chenzhao authored Sep 01, 2021
  
  fa926297
- Merge branch 'chenhao' into 'developer' · 64ee2ef6
  陈浩 authored Sep 01, 2021
```
Chenhao

See merge request !6
```
  64ee2ef6
- Merge remote-tracking branch 'origin/developer' into developer · 4c581c72
  chenzhao authored Sep 01, 2021
```
# Conflicts:
#	amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java
```
  4c581c72
- Merge branch 'developer' into chenhao · c17d2b80
  chenhao authored Sep 01, 2021
  
  c17d2b80
- 修改bug · aca8aeb0
  chenzhao authored Sep 01, 2021
  
  aca8aeb0