Commits · 4904df277ddc38e89090a655378306c52c78459e · java-sunac-report / sunac_report · GitLab

29 Sep, 2017 6 commits
- Merge remote-tracking branch 'origin/develop' into develop · 4904df27
  Java-张振楠 committed Sep 29, 2017
  
  4904df27 Browse Files
- merge · 11cee393
  Java-李昕颖 committed Sep 29, 2017
  
  11cee393 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 129be39e
```
# Conflicts:
#	src/main/resources/mappings/modules/report/ReportDao.xml
```
  Java-李昕颖 committed Sep 29, 2017
  129be39e Browse Files
- 配置融创连接信息 · 9ec220f8
  Java-张振楠 committed Sep 29, 2017
  
  9ec220f8 Browse Files
- 分页与用户列表修改 · b5765e74
  Java-李昕颖 committed Sep 29, 2017
  
  b5765e74 Browse Files
- 配置融创连接信息 · 2025ad5b
  Java-张振楠 committed Sep 29, 2017
  
  2025ad5b Browse Files
25 Sep, 2017 2 commits
- 部署测试修改 · 65095596
  Java-张振楠 committed Sep 25, 2017
  
  65095596 Browse Files
- 部署前修改 · 1e68c8be
  Java-张振楠 committed Sep 25, 2017
  
  1e68c8be Browse Files
22 Sep, 2017 3 commits
- 修改几个小bug · c5b54072
  Java-张振楠 committed Sep 22, 2017
  
  c5b54072 Browse Files
- Merge branch 'develop' of ssh://git.okayapps.com:5859/java-sunac-report/sunac_report into develop · 70eed284
  Java-张振楠 committed Sep 22, 2017
  
  70eed284 Browse Files
- 转为文档、发邮件，以及各种改终极版 · d8c18c66
  Java-李昕颖 committed Sep 22, 2017
  
  d8c18c66 Browse Files
21 Sep, 2017 1 commit
- 单点登录 · 1a2dc33e
  Java-张振楠 committed Sep 21, 2017
  
  1a2dc33e Browse Files
20 Sep, 2017 4 commits
- Merge remote-tracking branch 'origin/develop' into develop · 5f12e018
  Java-李昕颖 committed Sep 20, 2017
  
  5f12e018 Browse Files
- 工作转交及导出Excel修改 · d35de3f9
  Java-李昕颖 committed Sep 20, 2017
  
  d35de3f9 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 59733c3a
  mengxy committed Sep 20, 2017
  
  59733c3a Browse Files
- 联调web文件上传和Base64文件上传以及提交举报信息回填文件上传reportId字段 · ef3f5673
  mengxy committed Sep 20, 2017
  
  ef3f5673 Browse Files
19 Sep, 2017 2 commits
- Excel导出 · 9f1cd6bc
  Java-李昕颖 committed Sep 19, 2017
  
  9f1cd6bc Browse Files
- 添加消息 · 2ad2f8c6
  Java-李昕颖 committed Sep 19, 2017
  
  2ad2f8c6 Browse Files
18 Sep, 2017 3 commits
- Merge remote-tracking branch 'origin/develop' into develop · af728ff7
  Java-李昕颖 committed Sep 18, 2017
  
  af728ff7 Browse Files
- 举报移交 · 9831dc18
  Java-李昕颖 committed Sep 18, 2017
  
  9831dc18 Browse Files
- 消息中心 · cf62224d
  mengxy committed Sep 18, 2017
  
  cf62224d Browse Files
15 Sep, 2017 5 commits
- Merge remote-tracking branch 'origin/develop' into develop · 6999b2bc
  mengxy committed Sep 15, 2017
  
  6999b2bc Browse Files
- 消息中心 · 1ccc5304
  mengxy committed Sep 15, 2017
  
  1ccc5304 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · ad8e3800
```
# Conflicts:
#	src/main/java/com/ejweb/modules/report/dao/ReportDao.java
#	src/main/resources/mappings/modules/report/ReportDao.xml
```
  Java-李昕颖 committed Sep 15, 2017
  ad8e3800 Browse Files
- 举报移交 · 6c2d4e1a
  Java-李昕颖 committed Sep 15, 2017
  
  6c2d4e1a Browse Files
- 工作台模块解决谷歌浏览器不兼容问题 · 2e3e005a
  mengxy committed Sep 15, 2017
  
  2e3e005a Browse Files
14 Sep, 2017 4 commits
- 提交reportDao冲突部分代码 · 551b9751
  mengxy committed Sep 14, 2017
  
  551b9751 Browse Files
- 提交reportDao冲突部分代码 · cede9b8f
  mengxy committed Sep 14, 2017
  
  cede9b8f Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 1baecdb2
  mengxy committed Sep 14, 2017
  
  1baecdb2 Browse Files
- 工作台代码 · 0a550977
  mengxy committed Sep 14, 2017
  
  0a550977 Browse Files
13 Sep, 2017 5 commits
- 举报查看、跟踪各种改 · 5663def1
  Java-李昕颖 committed Sep 13, 2017
  
  5663def1 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · b6e87205
  Java-李昕颖 committed Sep 13, 2017
  
  b6e87205 Browse Files
- 举报查看、跟踪各种改 · 8c7f1b5e
  Java-李昕颖 committed Sep 13, 2017
  
  8c7f1b5e Browse Files
- 单点登录相关接口 · 2b0edf8d
  Java-张振楠 committed Sep 13, 2017
  
  2b0edf8d Browse Files
- 举报提交接口添加字段 · 750c8c76
  Java-李昕颖 committed Sep 13, 2017
  
  750c8c76 Browse Files
12 Sep, 2017 5 commits
- 上传文件添加跨域请求 · 720f081e
  Java-李昕颖 committed Sep 12, 2017
  
  720f081e Browse Files
- 文件上传接口没加@Controller · 5b079aca
  Java-李昕颖 committed Sep 12, 2017
  
  5b079aca Browse Files
- 举报查看、跟踪 · 87e6753b
  Java-李昕颖 committed Sep 12, 2017
  
  87e6753b Browse Files
- Merge branch 'develop' of https://git.okayapps.com/java-sunac-report/sunac_report into develop · d6a51b68
  Java-李昕颖 committed Sep 12, 2017
  
  d6a51b68 Browse Files
- 修改servlet映射 · 95ec05e8
  Java-张振楠 committed Sep 12, 2017
  
  95ec05e8 Browse Files