Signed-off-by: mingyuan <mingyuan0715@foxmail.com>
测试 carousel
Signed-off-by: mingyuan <mingyuan0715@foxmail.com>
测试图片显示功能
恢复 sales处理
上传图片功能修饰
Signed-off-by: mingyuan <mingyuan0715@foxmail.com>
更新about index页面
Signed-off-by: mingyuan <mingyuan0715@foxmail.com>
删除一些迁移任务
Signed-off-by: mingyuan <mingyuan0715@foxmail.com>
Merge branch 'master' of https://gitcafe.com/xinshengyin/120kang.git

Conflicts:
	db/migrate/20130910094341_add_taxon_id_to_doctors.rb
Signed-off-by: mingyuan <mingyuan0715@foxmail.com>
调整为通用模板
Signed-off-by: mingyuan <mingyuan0715@foxmail.com>
Signed-off-by: mingyuan <mingyuan0715@foxmail.com>
Signed-off-by: mingyuan <mingyuan0715@foxmail.com>
Signed-off-by: mingyuan <mingyuan0715@foxmail.com>
Signed-off-by: mingyuan <mingyuan0715@foxmail.com>
Signed-off-by: mingyuan <mingyuan0715@foxmail.com>