Commits · b2ec8c2e8594dd344abbf75b031d97e959145c27 · barry cho / Oa System

12 Sep, 2017 7 commits
- 所有查询修改页面跳转的bug继续发给 · b2ec8c2e
  admin authored 7 years ago
  
  b2ec8c2e
- Merge remote-tracking branch 'origin/lx' · 682599e9
  luoxiang authored 7 years ago
  
  682599e9
- Merge remote-tracking branch 'origin/sj' · f872edc7
  luoxiang authored 7 years ago
  
  f872edc7
- Merge remote-tracking branch 'origin/yqs' · 1ef214b4
  luoxiang authored 7 years ago
  
  1ef214b4
- 整合最近内容 · 90c62947
  luoxiang authored 7 years ago
  
  90c62947
- 修改 · 975b5b82
  admin authored 7 years ago
  
  975b5b82
- f'ca'e · ede98630
  宋妈 authored 7 years ago
  
  ede98630
11 Sep, 2017 2 commits
- dqef · 04f57cd8
  宋妈 authored 7 years ago
  
  04f57cd8
- 文件上传后台部分 · ad446cb5
  Administrator authored 7 years ago
  
  ad446cb5
09 Sep, 2017 9 commits
- 修改bug · c69dd44b
  admin authored 7 years ago
  
  c69dd44b
- 修改了ajax和编辑器冲突的bug · 1c61f927
  admin authored 7 years ago
```
将笔记一部分功能 除了增加 修改以外的实现
```
  1c61f927
- 文件模块显示部分完善 · 0c5dd0d8
  Administrator authored 7 years ago
  
  0c5dd0d8
- 文件模块显示部分完善 · 5bc634bf
  Administrator authored 7 years ago
  
  5bc634bf
- 任务管理 · a115dcc6
  宋妈 authored 7 years ago
  
  a115dcc6
- Merge remote-tracking branch 'origin/lx' · 080ecd7c
  luoxiang authored 7 years ago
```
Conflicts:
	src/main/java/cn/gson/oasys/model/dao/IndexDao.java
```
  080ecd7c
- Merge remote-tracking branch 'origin/sj' · 988798b7
  luoxiang authored 7 years ago
  
  988798b7
- Merge remote-tracking branch 'origin/yqs' · 447624fe
  luoxiang authored 7 years ago
  
  447624fe
- 传数据 · 93e980f5
  宋妈 authored 7 years ago
  
  93e980f5
08 Sep, 2017 3 commits
- 菜单列表实现上移、下移功能排序；字体同一变成14px，把原来的奇怪的大小变好了 · e4996a2b
  luoxiang authored 7 years ago
  
  e4996a2b
- 笔记修改 · 42cfe472
  admin authored 7 years ago
  
  42cfe472
- 文件查询简单连数据库 · 291daf1f
  Administrator authored 7 years ago
  
  291daf1f
07 Sep, 2017 10 commits
- Merge remote-tracking branch 'origin/zhx' · 014fd296
  luoxiang authored 7 years ago
  
  014fd296
- Merge remote-tracking branch 'origin/yqs' · dfedb425
  luoxiang authored 7 years ago
```
Conflicts:
	src/main/resources/static/css/common/box.css
	src/main/resources/templates/common/leftlist.ftl
```
  dfedb425
- Merge remote-tracking branch 'origin/sj' · 1658b352
  luoxiang authored 7 years ago
  
  1658b352
- 菜单栏实现后天数据库链接 · 71147e9c
  luoxiang authored 7 years ago
  
  71147e9c
- 2333 · a7318542
  admin authored 7 years ago
  
  a7318542
- feqwf · c5ac9c33
  宋妈 authored 7 years ago
  
  c5ac9c33
- 文件页面的改变 · 5304c4cf
  Administrator authored 7 years ago
  
  5304c4cf
- Merge remote-tracking branch 'origin/sj' · 121c3d16
  luoxiang authored 7 years ago
  
  121c3d16
- 部分小样式微调 · 60f668d9
  luoxiang authored 7 years ago
  
  60f668d9
- e23 · 00e98cdc
  宋妈 authored 7 years ago
  
  00e98cdc
06 Sep, 2017 9 commits
- iframe框架的应用，基本界面都已ok · e100e277
  luoxiang authored 7 years ago
  
  e100e277
- Merge remote-tracking branch 'origin/zhx' · 034b5840
  luoxiang authored 7 years ago
  
  034b5840
- Merge remote-tracking branch 'origin/yqs' · 74feb9d0
  luoxiang authored 7 years ago
  
  74feb9d0
- Merge remote-tracking branch 'origin/sj' · e029ba48
  luoxiang authored 7 years ago
  
  e029ba48
- iframe的应用 · b9cabf6c
  luoxiang authored 7 years ago
  
  b9cabf6c
- index删除 · 5e21d384
  Administrator authored 7 years ago
  
  5e21d384
- 2333 · 38584563
  admin authored 7 years ago
  
  38584563
- Merge branch 'sj' of https://git.oschina.net/aaluoxiang/oa_system.git into sj · 900661a4
  宋妈 authored 7 years ago
  
  900661a4
- ddge · c0984b16
  宋妈 authored 7 years ago
  
  c0984b16