计算价格
Merge branch 'newui' of https://github.com/lln7777/zhuyun into dev
Merge branch 'dev' of https://github.com/lvlx/zhuyun into jack
fix线的颜色
ecs,rds配置
Merge branch 'dev' of https://github.com/lln7777/zhuyun into newui
fix line bug
Merge branch 'merge' into dev
Merge branch 'newui' of https://github.com/lln7777/zhuyun into dev

Conflicts:
	views/main.ejs
Merge branch 'jack' of https://github.com/lln7777/zhuyun into merge
Merge branch 'merge' into dev
Merge branch 'dev' of https://github.com/lln7777/zhuyun into newui
新建架构配置
修正左边菜单样式
slb配置
Merge branch 'newui' of https://github.com/lln7777/zhuyun into merge

Conflicts:
	public/javascripts/index.js
Merge branch 'merge' into dev
Merge branch 'dev' of https://github.com/lvlx/zhuyun into jack
fix select bug
Merge branch 'fixbug' into dev