Commits · bd434b982e770926806b03562be2ea92f0fcf5b7 · 方涛升 / govdna

08 Aug, 2018 6 commits
- Merge branch 'master' of http://115.233.227.46:8066/root/govdna.git · bd434b98
  Fred authored Aug 08, 2018
  
  bd434b98
- 批量删除 · 5746e67f
  Fred authored Aug 08, 2018
  
  5746e67f
- 部门-刘弈臻 · 7b5d1aa8
  刘弈臻 authored Aug 08, 2018
  
  7b5d1aa8
- 公共字段更新 · b6449fc2
  Fred authored Aug 08, 2018
  
  b6449fc2
- Merge branch 'master' of http://115.233.227.46:8066/root/govdna.git · 881e04d3
  Fred authored Aug 08, 2018
  
  881e04d3
- 菜单 · 040f641b
  Fred authored Aug 08, 2018
  
  040f641b
07 Aug, 2018 11 commits
- Merge branch 'master' of http://115.233.227.46:8066/root/govdna.git · c7a478aa
  刘弈臻 authored Aug 07, 2018
  
  c7a478aa
- 角色 -刘弈臻 · 6d1e0788
  刘弈臻 authored Aug 07, 2018
  
  6d1e0788
- 修改密码 · bbaf2162
  Administrator authored Aug 07, 2018
  
  bbaf2162
- 功能增加 · 548ba251
  Administrator authored Aug 07, 2018
  
  548ba251
- 增加功能 · c3d0ecb3
  Administrator authored Aug 07, 2018
  
  c3d0ecb3
- 字典service变更 - 方涛升 · 27ef2675
  Fred authored Aug 07, 2018
  
  27ef2675
- Merge branch 'master' of http://115.233.227.46:8066/root/govdna.git · 857e7476
  Fred authored Aug 07, 2018
```
Conflicts:
	src/main/java/com/govmade/modules/system/service/impl/UserServiceImpl.java
```
  857e7476
- 集成数据字典 · 67b7c94b
  Fred authored Aug 07, 2018
  
  67b7c94b
- user · 786001e8
  Administrator authored Aug 07, 2018
  
  786001e8
- did 改回deptId · d30db6af
  Administrator authored Aug 07, 2018
  
  d30db6af
- 修改字段名称deptId改为did 陈骏寅 · 473b680f
  Administrator authored Aug 07, 2018
  
  473b680f
06 Aug, 2018 3 commits
- 入口文件名变更 - 方涛升 · 33914b41
  Fred authored Aug 06, 2018
  
  33914b41
- shiro去掉 · 2f68d77f
  Fred authored Aug 06, 2018
  
  2f68d77f
- http://115.233.227.46:8066/root/govdna.git · 8bd28814
  Fred authored Aug 06, 2018
  
  8bd28814