删除多余的菜单
修改下载文件方法
Merge branch 'master' into dev
....
解决浏览器滚动条问题

Change-Id: I6496f668e51d1109fef513198e139a169e3fb683
Signed-off-by: rguess <502876941@qq.com>
datetimepicker
随机颜色加入app.js中

Signed-off-by: rguess <502876941@qq.com>

Change-Id: I28a9215ffd117d0d795ecf5110289ba64d607beb
123
在IE下退出系统的bug

Change-Id: Ia9245839c15faa6c1dcad2ee621d45e1ded7ca1b
自由流

Change-Id: I9609577ea1439cea4ff5fabb5d6304138825bd10
Signed-off-by: rguess <502876941@qq.com>
Merge branch 'dev' of git.oschina.net:rguess/thinker into dev
自由流部分

Conflicts:
	thinker-web/src/main/webapp/WEB-INF/content/finance/edit.jsp
	thinker-web/src/main/webapp/WEB-INF/content/finance/list.jsp
自由流部分


Change-Id: Icdf060f9fbb8b02c48bad614d8ec0f3c72ca3bef
Signed-off-by: rguess <502876941@qq.com>
123
自由流部分

Conflicts:
	thinker-web/src/main/webapp/WEB-INF/content/finance/edit.jsp
	thinker-web/src/main/webapp/WEB-INF/content/finance/list.jsp
freeflow
修改我的流程分页的bug

Change-Id: I9feb90363b1856dddf75ee567abf713f73af391d
Signed-off-by: rguess <502876941@qq.com>
Merge branch 'dev' of git.oschina.net:rguess/thinker into dev
demo html
word to html