重构filter代码
Merge branch 'master' of 10.1.50.125:/home/git/front_end_likeTableau
过滤器的重新设计
针对过滤器model提交给服务器的数据有冗余的情况下，强迫其只提交服务器所需数据
可以按照过去几年进行过滤
Merge branch 'master' of 10.1.50.125:/home/git/front_end_likeTableau

Conflicts:
	templates/widget/widget_add/assets/js/common/test.js
Merge branch 'master' of 10.1.50.125:/home/git/front_end_likeTableau

Conflicts:
	templates/widget/widget_add/assets/js/common/test.js
Merge branch 'master' of 10.1.50.125:/home/git/front_end_likeTableau

Conflicts:
	connect/sqltool.py
调整代码

Conflicts:
	connect/sqltool.py
Merge branch 'master' of 10.1.50.125:/home/git/front_end_likeTableau
连接前端，可以进行过滤
连接前端，可以进行过滤
Merge branch 'master' of 10.1.50.125:/home/git/front_end_likeTableau

Conflicts:
	widget/factor.py
过滤器区间取值的时候提交的形式改为["min", "-", "max"]
Merge branch 'master' of 10.1.50.125:/home/git/front_end_likeTableau
Merge branch 'master' of 10.1.50.125:/home/git/front_end_likeTableau
临时保存