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

09 Sep, 2021 5 commits
- Merge remote-tracking branch 'origin/chenhao' into chenhao · c7f04539
  chenzhao authored Sep 09, 2021
```
# Conflicts:
#	amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
```
  c7f04539
- 机场部门修改时code值也应发生变化，bug 2812 一次删除多条数据传入类型修改为string · c59e67e8
  chenzhao authored Sep 09, 2021
  
  c59e67e8
- BUG 2740 机场单位主键varchar 导致通过主键搜索返回多条数据 2021-09-09 by kongfm · c6ed332e
  kongfm authored Sep 09, 2021
  
  c6ed332e
- Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao · 0004dfec
  chenzhao authored Sep 09, 2021
  
  0004dfec
- 数据字典还原 by kongfm 2021-09-09 · 30ae3bd6
  kongfm authored Sep 09, 2021
  
  30ae3bd6
08 Sep, 2021 25 commits
- 2021-09-08 前端表示前端传递的address参数已经切割过，后端无需再切割获取陈召屏蔽代码 97-102行 173-178行 · e0405eab
  chenzhao authored Sep 08, 2021
  
  e0405eab
- 单位编辑后 code值未发生改变已修改屏蔽指定类型 · c906e643
  chenzhao authored Sep 08, 2021
  
  c906e643
- 数据字典生成树方法原先通过getCode做主键现修改为 getSequenceNbr 后期数据字典parent字段保存id 而不要保存code by kongfm 2021-09-08 · 7d9ff827
  kongfm authored Sep 08, 2021
  
  7d9ff827
- 因code不唯一修改根据code查询增添条件 type 判断条件 code相等 type值相等 v1 · 4153ee54
  chenzhao authored Sep 08, 2021
  
  4153ee54
- Revert "因code不唯一修改根据code查询增添条件 type 判断条件 code相等 type值相等" · 7e567160
  chenzhao authored Sep 08, 2021
```
This reverts commit f65d6dee.
```
  7e567160
- 补充DataDictionaryMapper层 · f8ba80a6
  chenzhao authored Sep 08, 2021
  
  f8ba80a6
- 补充DataDictionaryController层 · e70d7484
  chenzhao authored Sep 08, 2021
  
  e70d7484
- 因code不唯一修改根据code查询增添条件 type 判断条件 code相等 type值相等 · f65d6dee
  chenzhao authored Sep 08, 2021
  
  f65d6dee
- Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao · 427e8239
  chenzhao authored Sep 08, 2021
  
  427e8239
- 任务 3374 添加GIS地图配置查看补充提交serviceImpl层 · 6b31a881
  chenzhao authored Sep 08, 2021
  
  6b31a881
- 航空器信息按时间倒叙排列add rec_date 2021-09-08 by kongfm · b8f89f62
  kongfm authored Sep 08, 2021
  
  b8f89f62
- 危化品按时间倒叙排列add rec_date 2021-09-08 by kongfm · 1b62ecf9
  kongfm authored Sep 08, 2021
  
  1b62ecf9
- 消防水源按时间倒叙排列add order by cb_water_resource.rec_date desc 2021-09-08 by kongfm · 31953a6f
  kongfm authored Sep 08, 2021
  
  31953a6f
- 微型消防站按时间倒叙排列add order by cb_fire_station.rec_date desc 2021-09-08 by kongfm · 6249f0f7
  kongfm authored Sep 08, 2021
  
  6249f0f7
- Merge remote-tracking branch 'origin/chenhao' into chenhao · 350947f4
  kongfm authored Sep 08, 2021
  
  350947f4
- 机场单位人员按时间倒叙排列add order by u.rec_date desc 2021-09-08 by kongfm · da739751
  kongfm authored Sep 08, 2021
  
  da739751
- Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao · 1caa996b
  chenzhao authored Sep 08, 2021
  
  1caa996b
- 2021-09-08 前端表示前端传递的address参数已经切割过，后端无需再切割获取陈召屏蔽代码 97-102 173-178行 · c0879a6a
  chenzhao authored Sep 08, 2021
  
  c0879a6a
- 消防专家按时间倒叙排列add rec_date 2021-09-08 by kongfm · b3b3a76e
  kongfm authored Sep 08, 2021
  
  b3b3a76e
- Merge remote-tracking branch 'origin/chenhao' into chenhao · 8f2f9efd
  kongfm authored Sep 08, 2021
  
  8f2f9efd
- 联动单位列表按时间倒叙排列add order by clu.rec_date desc 同时处理单位根节点-1时查询全部数据问题 2021-09-08 by kongfm · daf5c980
  kongfm authored Sep 08, 2021
  
  daf5c980
- Merge branch 'chenhao' of http://172.16.10.76/moa/amos-boot-biz into chenhao · 67f4ee38
  chenzhao authored Sep 08, 2021
  
  67f4ee38
- 任务 3374 添加GIS地图配置查看前端表示getFormValue方法返回值为名称无法回显要求返回值重新改为code值 · 9f059b5a
  chenzhao authored Sep 08, 2021
  
  9f059b5a
- 消防队员列表按时间倒叙排列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 9 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