提交 · 8449bd503a1bd1fe8c01ea331f612a8e7de63162 · 许言琪 / aroad_aqsc

29 4月, 2019 4 次提交
- 更新智慧公路sql，主要是中长期规划项 · 8449bd50
  由朱运伟提交于 4月 29, 2019
  
  8449bd50
- 智慧养护工程信息树结构代码修改 · 55024c62
  由张龙发提交于 4月 29, 2019
  
  55024c62
- 智慧公路sql · b225584e
  由朱运伟提交于 4月 29, 2019
  
  b225584e
- 修改bug · 6c35c594
  由朱运伟提交于 4月 29, 2019
  
  6c35c594
28 4月, 2019 6 次提交
- Merge remote-tracking branch 'origin/dev' into dev · fa632738
  由张龙发提交于 4月 28, 2019
  
  fa632738
- Merge remote-tracking branch 'origin/dev' into dev · 59ad1b66
  由张龙发提交于 4月 28, 2019
```
# Conflicts:
#	src/main/java/com/elephant/framework/galaxy/aroad/module/zhtj/mapper/ZhtjGljsdjqkMapper.java
#	src/main/resources/mapper/zhtj/ZhtjGljsdjqkMapper.xml
```
  59ad1b66
- 智慧决策 · 3cd33fca
  由朱运伟提交于 4月 28, 2019
  
  3cd33fca
- 智慧公路代码提交 · 191beccf
  由张龙发提交于 4月 28, 2019
  
  191beccf
- feat(info template): add info template module · edff9146
  由宋文杰提交于 4月 28, 2019
  
  edff9146
- feat(info): add info.sql · fd2dc2e0
  由宋文杰提交于 4月 28, 2019
  
  fd2dc2e0
26 4月, 2019 5 次提交
- feat(attendance): add the function of remove attendance member with permission control · 8ab3b668
  由宋文杰提交于 4月 26, 2019
  
  8ab3b668
- feat(attendance): update attendance.sql to add attendance permission control · 683ba7f2
  由宋文杰提交于 4月 26, 2019
  
  683ba7f2
- fix(attendance templates): update attendance.sql to remove unit field from… · d618ded0
  由宋文杰提交于 4月 26, 2019
```
fix(attendance templates): update attendance.sql to remove unit field from attendance_templates table
```
  d618ded0
- fix(attendance templates): fix attendance templates for visible inside the unit · 943461c7
  由宋文杰提交于 4月 26, 2019
  
  943461c7
- fix(attendance templates): fix attendance templates to auto binding department · ef067fb1
  由宋文杰提交于 4月 26, 2019
  
  ef067fb1
25 4月, 2019 9 次提交
- feat(emergency plan): add emergency plan paging and parametric query function · 01b5c3b2
  由宋文杰提交于 4月 25, 2019
  
  01b5c3b2
- feat(emergency plan): add emergency plan updated function · 138017fc
  由宋文杰提交于 4月 25, 2019
  
  138017fc
- feat(emergency plan): add emergency plan paged queries function · 90da70cb
  由宋文杰提交于 4月 25, 2019
  
  90da70cb
- feat(emergency plan): add emergency plan save function · b26abcc1
  由宋文杰提交于 4月 25, 2019
  
  b26abcc1
- feat(emergency plan): add the restful api for emergency plan file upload · 355b0fe5
  由宋文杰提交于 4月 25, 2019
  
  355b0fe5
- feat(emergency plan): add the emergency plan module · 88e76940
  由宋文杰提交于 4月 25, 2019
  
  88e76940
- feat(ermergency plan): add emergency_plan.sql · ed5b719c
  由宋文杰提交于 4月 25, 2019
  
  ed5b719c
- Add RoadCondition DB · 379b00f4
  由 Phyday 提交于 4月 25, 2019
  
  379b00f4
- Add RoadCondition Show Function · 2c85c56b
  由 Phyday 提交于 4月 25, 2019
  
  2c85c56b
23 4月, 2019 9 次提交
- fix(attendanceTemplate): fix the default value data format for unit · 4d3819d4
  由宋文杰提交于 4月 23, 2019
  
  4d3819d4
- feat(util): add json util class · 315d1e31
  由宋文杰提交于 4月 23, 2019
  
  315d1e31
- feat(attendance): update attendance.sql · 9189e9d0
  由宋文杰提交于 4月 23, 2019
  
  9189e9d0
- feat(attendance): update attendance.sql to add attendance logs operating permission · 45923a1f
  由宋文杰提交于 4月 23, 2019
  
  45923a1f
- fix(attendance): fix the attendance logs page api to add deptName and profileContent fields · 44cc927d
  由宋文杰提交于 4月 23, 2019
  
  44cc927d
- feat(attendance): add attendance logs moudle · a28215c6
  由宋文杰提交于 4月 23, 2019
  
  a28215c6
- fix(attendance): fix attendance template page selection to add deptName field · e5d0c5ee
  由宋文杰提交于 4月 23, 2019
  
  e5d0c5ee
- fix(attendance): fix save attendance template · 4f1e7eaf
  由宋文杰提交于 4月 23, 2019
  
  4f1e7eaf
- feat(attendance): update attendance.sql to add table comment · ae4ba42c
  由宋文杰提交于 4月 23, 2019
  
  ae4ba42c
22 4月, 2019 5 次提交
- Merge remote-tracking branch 'origin/dev' into dev · 9c21a9cd
  由宋文杰提交于 4月 22, 2019
  
  9c21a9cd
- feat(attendance): update attendance.sql to add attedance_logs datatable structure · 6db59f7f
  由宋文杰提交于 4月 22, 2019
  
  6db59f7f
- 新增应急资源模块 · c676f6ce
  由 Phyday 提交于 4月 22, 2019
  
  c676f6ce
- feat(attendance): update attendance.sql · 7eb05cdf
  由宋文杰提交于 4月 22, 2019
  
  7eb05cdf
- feat(attendance): update restful api for attendance template to be linked unit(department) · 3662749c
  由宋文杰提交于 4月 22, 2019
  
  3662749c
19 4月, 2019 2 次提交
- Merge remote-tracking branch 'origin/dev' into dev · f49c51b6
  由朱运伟提交于 4月 19, 2019
  
  f49c51b6
- 交通发展分析 · 8e388f48
  由朱运伟提交于 4月 19, 2019
  
  8e388f48