方法换位置
Merge branch 'sx_func' of https://github.com/lln7777/zhuyun into fixbug/scale

Conflicts:
	public/javascripts/funcs.coffee
Merge branch 'fixbug/scale' into dev