Commits · 250701a5d9e762ea763536f2baadc8068700e351 · java-sunac-report / sunac_report · GitLab

13 Nov, 2017 6 commits
- 放开root的退出 · 250701a5
  java-lixy committed Nov 13, 2017
  
  250701a5 Browse Files
- 放开root的退出 · 1bcfc587
  java-lixy committed Nov 13, 2017
  
  1bcfc587 Browse Files
- 转交状态 · 9a12fc3b
  yjh committed Nov 13, 2017
  
  9a12fc3b Browse Files
- Merge branch 'develop' of https://git.okayapps.com/java-sunac-report/sunac_report into develop · 41e69f47
  java-lixy committed Nov 13, 2017
  
  41e69f47 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 10e32c90
  yjh committed Nov 13, 2017
  
  10e32c90 Browse Files
- 工作转交业务状态 · 4521bcb1
  yjh committed Nov 13, 2017
  
  4521bcb1 Browse Files
10 Nov, 2017 7 commits
- 放开root的退出 · 79132ae8
  java-lixy committed Nov 10, 2017
  
  79132ae8 Browse Files
- 导出、转为文档显示修改 · a9318f93
  java-lixy committed Nov 10, 2017
  
  a9318f93 Browse Files
- 覆盖版本重提交 · da910d2f
  yjh committed Nov 10, 2017
  
  da910d2f Browse Files
- 跟踪页面被覆盖重新提交 · b447f266
  xurui committed Nov 10, 2017
  
  b447f266 Browse Files
- 覆盖版本重提交 · d169b5dc
  yjh committed Nov 10, 2017
  
  d169b5dc Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 2acf3db0
```
# Conflicts:
#	src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
```
  yjh committed Nov 10, 2017
  2acf3db0 Browse Files
- 业务类型改成多选框 · dadf708f
  yjh committed Nov 10, 2017
  
  dadf708f Browse Files
09 Nov, 2017 4 commits
- /被举报部门 · 5ee318d3
  xurui committed Nov 09, 2017
  
  5ee318d3 Browse Files
- 处理结论修改 · 492f182b
  xurui committed Nov 09, 2017
  
  492f182b Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · b2559bc0
```
# Conflicts:
#	src/main/java/com/ejweb/modules/report/entity/ReportEntity.java
```
  xurui committed Nov 09, 2017
  b2559bc0 Browse Files
- 放开root的退出 · 058c0933
  xurui committed Nov 09, 2017
  
  058c0933 Browse Files
08 Nov, 2017 3 commits
- Merge remote-tracking branch 'origin/develop' into develop · f6f4afe1
  3 committed Nov 08, 2017
  
  f6f4afe1 Browse Files
- 添加OA账号列 · aeb825f8
  3 committed Nov 08, 2017
  
  aeb825f8 Browse Files
- 前端提交举报验证report_source参数 · dddda3fd
  java-lixy committed Nov 08, 2017
  
  dddda3fd Browse Files
06 Nov, 2017 1 commit
- 发邮件修改 · a83eed6f
  java-lixy committed Nov 06, 2017
  
  a83eed6f Browse Files
02 Nov, 2017 1 commit
- 保存附件地址乱码 · d79e6b73
```
新增转为word文档功能
```
  java-lixy committed Nov 02, 2017
  d79e6b73 Browse Files
24 Oct, 2017 1 commit
- 消息中心修改+添加功能：转为word文档 · de72a624
  java-lixy committed Oct 24, 2017
  
  de72a624 Browse Files
19 Oct, 2017 1 commit
- 培训后修改 · 72997486
  java-lixy committed Oct 19, 2017
  
  72997486 Browse Files
18 Oct, 2017 2 commits
- 各种改 · c9eb03f0
  java-lixy committed Oct 18, 2017
  
  c9eb03f0 Browse Files
- 小改动 · 85b8d07d
  java-lixy committed Oct 18, 2017
  
  85b8d07d Browse Files
17 Oct, 2017 1 commit
- 消息中心小红圈 · d6a8df9b
  java-lixy committed Oct 17, 2017
  
  d6a8df9b Browse Files
16 Oct, 2017 1 commit
- 添加visit · 185f311c
  Java-李昕颖 committed Oct 16, 2017
  
  185f311c Browse Files
13 Oct, 2017 2 commits
- 添加来访 · 03866160
  Java-李昕颖 committed Oct 13, 2017
  
  03866160 Browse Files
- 各种改 · 3d0064d7
  Java-李昕颖 committed Oct 13, 2017
  
  3d0064d7 Browse Files
11 Oct, 2017 2 commits
- 专为文档修改 · 6fee7c24
  Java-李昕颖 committed Oct 11, 2017
  
  6fee7c24 Browse Files
- ssoDao加限制 · 774625fe
  Java-李昕颖 committed Oct 11, 2017
  
  774625fe Browse Files
10 Oct, 2017 2 commits
- 工作台、转文档等修改 · ca6b6000
  Java-李昕颖 committed Oct 10, 2017
  
  ca6b6000 Browse Files
- 各种改啊 · 55cb247d
  Java-李昕颖 committed Oct 10, 2017
  
  55cb247d Browse Files
09 Oct, 2017 5 commits
- 小bug · dcfe1d57
  Java-李昕颖 committed Oct 09, 2017
  
  dcfe1d57 Browse Files
- 工作台、权限等修改 · 3b7577ec
  Java-李昕颖 committed Oct 09, 2017
  
  3b7577ec Browse Files
- 页面修改 · eda923f7
  Java-李昕颖 committed Oct 09, 2017
  
  eda923f7 Browse Files
- 城市下拉列表工作台修改 · 005fda73
  Java-李昕颖 committed Oct 09, 2017
  
  005fda73 Browse Files
- 导出pdf，jsp验证等修改 · 3321198b
  Java-李昕颖 committed Oct 09, 2017
  
  3321198b Browse Files
30 Sep, 2017 1 commit
- 修改代码，以适配融创oracle数据库 · 2ce40995
  Java-张振楠 committed Sep 30, 2017
  
  2ce40995 Browse Files