modified:   .idea/.generators
	new file:   .idea/dataSources.ids
	new file:   .idea/dataSources.xml
	modified:   .idea/runConfigurations/Development__vt.xml
	modified:   .idea/runConfigurations/Production__vt.xml
	modified:   .idea/runConfigurations/spec__vt.xml
	modified:   .idea/runConfigurations/test__vt.xml
	modified:   .idea/vt.iml
	modified:   .idea/workspace.xml
	modified:   Gemfile
	renamed:    app/assets/stylesheets/.DS_Store -> app/.DS_Store
	modified:   app/assets/.DS_Store
	new file:   app/assets/images/mobile/_alcohol.png
	new file:   app/assets/images/mobile/_dairy.png
	new file:   app/assets/images/mobile/_meat.png
	new file:   app/assets/images/mobile/_snacks.png
	new file:   app/assets/images/tairyo/bg3.png
	new file:   app/assets/images/tairyo/coupon_bg.png
	new file:   app/assets/images/tairyo/logo.jpg
	new file:   app/assets/images/tairyo/newbg22.png
	new file:   app/assets/images/tairyo/no.png
	new file:   app/assets/images/tairyo/sanwenyu.jpg
	new file:   app/assets/images/tairyo/thumb.jpg
	new file:   app/assets/images/tairyo/tuan.jpg
	new file:   app/assets/images/tairyo/yes.png
	new file:   app/assets/images/tairyo/you.png
	new file:   "app/assets/images/tairyo/\345\214\227\346\236\201\350\264\235\345\210\272\350\272\253.jpg"
	new file:   "app/assets/images/tairyo/\345\255\243\350\212\202\351\261\274\347\224\237\345\217\214\346\213\274.jpg"
	new file:   "app/assets/images/tairyo/\347\224\237\351\243\237\347\211\233\350\202\211.jpg"
	new file:   app/assets/javascripts/coupon.js.coffee
	new file:   app/assets/javascripts/review.js.coffee
	modified:   app/assets/javascripts/store/orders.js.coffee
	new file:   app/assets/javascripts/store/tairyo_order.js
	new file:   app/assets/javascripts/tairyo.js.coffee
	new file:   app/assets/stylesheets/coupon.css.scss
	modified:   app/assets/stylesheets/mobile/layout.min.css
	new file:   app/assets/stylesheets/tairyo.css.scss
	modified:   app/controllers/admin/applicants_controller.rb
	modified:   app/controllers/application_controller.rb
	modified:   app/controllers/comments_controller.rb
	new file:   app/controllers/coupon_controller.rb
	modified:   app/controllers/sessions_controller.rb
	modified:   app/controllers/store/cart_controller.rb
	modified:   app/controllers/store/cats_controller.rb
	modified:   app/controllers/store/goods_controller.rb
	modified:   app/controllers/store/orders_controller.rb
	new file:   app/controllers/tairyo_controller.rb
	modified:   app/controllers/users_controller.rb
	modified:   app/controllers/vshop_controller.rb
	modified:   app/helpers/application_helper.rb
	new file:   app/helpers/coupon_helper.rb
	new file:   app/helpers/review_helper.rb
	new file:   app/helpers/tairyo_helper.rb
	modified:   app/models/ecstore/account.rb
	modified:   app/models/ecstore/order.rb
	new file:   app/models/ecstore/order_dining.rb
	modified:   app/models/ecstore/supplier.rb
	modified:   app/views/admin/goods/_form.html.erb
	modified:   app/views/comments/_comment.html.erb
	modified:   app/views/comments/_form.html.erb
	new file:   app/views/comments/tairyo_comment.html.erb
	new file:   app/views/coupon/index.html.erb
	new file:   app/views/coupon/lingqu.html.erb
	new file:   app/views/coupon/mycoupon.html.erb
	new file:   app/views/layouts/tairyo_new.html.erb
	modified:   app/views/mobile/show.html.erb
	new file:   app/views/sessions/create_tairyo.js.erb
	new file:   app/views/sessions/new_tairyo.html.erb
	new file:   app/views/sessions/register_tairyo.html.erb
	new file:   app/views/store/cart/jinbalang.html.erb
	modified:   app/views/store/cart/mobile.html.erb
	new file:   app/views/store/cart/tairyo.html.erb
	new file:   app/views/store/cart/tairyo_add.js.erb
	new file:   app/views/store/cart/tairyo_cart.html.erb
	new file:   app/views/store/cats/show_group.html.erb
	modified:   app/views/store/goods/_good.html.erb
	modified:   app/views/store/goods/_product.html.erb
	new file:   app/views/store/goods/tairyo_tuan.html.erb
	modified:   app/views/store/orders/_coupons.html.erb
	modified:   app/views/store/orders/new_mobile.html.erb
	new file:   app/views/store/orders/new_tairyo.html.erb
	new file:   app/views/store/orders/tairyo_order.html.erb
	new file:   app/views/store/orders/tairyo_share.html.erb
	modified:   app/views/store/shared/_btm_items.html.erb
	new file:   app/views/tairyo/bus.html.erb
	new file:   app/views/tairyo/car.html.erb
	new file:   app/views/tairyo/group.html.erb
	new file:   app/views/tairyo/index.html.erb
	new file:   app/views/tairyo/tairyo_tuan.html.erb
	new file:   app/views/tairyo/tese.html.erb
	new file:   app/views/tairyo/user.html.erb
	new file:   app/views/tairyo/walk.html.erb
	deleted:    config/database.yml.bak
	modified:   config/ecstore.yml.bak
	deleted:    config/ecstore.yml_bak
	modified:   config/routes.rb
	modified:   db/migrate/20130729083052_create_imodec_seo.rb
	modified:   db/migrate/20130731014845_add_path_and_params_to_imodec_seo.rb
	modified:   db/migrate/20130821030030_add_layout_to_static_pages.rb
	modified:   db/migrate/20130902094413_create_table_address.rb
	modified:   db/migrate/20130903025551_create_offline_coupons.rb
	modified:   db/migrate/20130909063735_create_table_coupon_downloads.rb
	modified:   db/migrate/20130910061813_add_detail_desc_to_brands.rb
	modified:   db/migrate/20130911084315_create_table_virtual_goods.rb
	modified:   db/migrate/20130916024000_add_slug_to_virtual_goods.rb
	modified:   db/migrate/20130918061922_create_table_payment_log.rb
	modified:   db/migrate/20131128061922_create_table_suppliers.rb
	deleted:    db/migrate/20140310170622_create_table_inventory.rb
	new file:   db/migrate/20140310170622_create_table_inventorys.rb
	new file:   db/migrate/20140813014927_create_order_dinings.rb
	modified:   db/schema.rb
	new file:   test/fixtures/order_dinings.yml
	new file:   test/fixtures/reviews.yml
	new file:   test/fixtures/sdb_b2c_order_dinings.yml
	new file:   test/functional/coupon_controller_test.rb
	new file:   test/functional/review_controller_test.rb
	new file:   test/functional/tairyo_controller_test.rb
	new file:   test/unit/helpers/coupon_helper_test.rb
	new file:   test/unit/helpers/review_helper_test.rb
	new file:   test/unit/helpers/tairyo_helper_test.rb
	new file:   test/unit/order_dining_test.rb
	new file:   test/unit/review_test.rb
	new file:   test/unit/sdb_b2c_order_dining_test.rb

	modified:   .idea/.generators
	new file:   .idea/dataSources.ids
	new file:   .idea/dataSources.xml
	modified:   .idea/runConfigurations/Development__vt.xml
	modified:   .idea/runConfigurations/Production__vt.xml
	modified:   .idea/runConfigurations/spec__vt.xml
	modified:   .idea/runConfigurations/test__vt.xml
	modified:   .idea/vt.iml
	modified:   .idea/workspace.xml
	modified:   Gemfile
	new file:   app/assets/images/mobile/_alcohol.png
	new file:   app/assets/images/mobile/_dairy.png
	new file:   app/assets/images/mobile/_meat.png
	new file:   app/assets/images/mobile/_snacks.png
	new file:   app/assets/images/tairyo/bg3.png
	new file:   app/assets/images/tairyo/coupon_bg.png
	new file:   app/assets/images/tairyo/logo.jpg
	new file:   app/assets/images/tairyo/newbg22.png
	new file:   app/assets/images/tairyo/no.png
	new file:   app/assets/images/tairyo/sanwenyu.jpg
	new file:   app/assets/images/tairyo/thumb.jpg
	new file:   app/assets/images/tairyo/tuan.jpg
	new file:   app/assets/images/tairyo/yes.png
	new file:   app/assets/images/tairyo/you.png
	new file:   "app/assets/images/tairyo/\345\214\227\346\236\201\350\264\235\345\210\272\350\272\253.jpg"
	new file:   "app/assets/images/tairyo/\345\255\243\350\212\202\351\261\274\347\224\237\345\217\214\346\213\274.jpg"
	new file:   "app/assets/images/tairyo/\347\224\237\351\243\237\347\211\233\350\202\211.jpg"
	new file:   app/assets/javascripts/coupon.js.coffee
	new file:   app/assets/javascripts/review.js.coffee
	modified:   app/assets/javascripts/store/orders.js.coffee
	new file:   app/assets/javascripts/store/tairyo_order.js
	new file:   app/assets/javascripts/tairyo.js.coffee
	new file:   app/assets/stylesheets/coupon.css.scss
	modified:   app/assets/stylesheets/mobile/layout.min.css
	new file:   app/assets/stylesheets/tairyo.css.scss
	modified:   app/controllers/admin/applicants_controller.rb
	modified:   app/controllers/application_controller.rb
	modified:   app/controllers/comments_controller.rb
	new file:   app/controllers/coupon_controller.rb
	modified:   app/controllers/sessions_controller.rb
	modified:   app/controllers/store/cart_controller.rb
	modified:   app/controllers/store/cats_controller.rb
	modified:   app/controllers/store/goods_controller.rb
	modified:   app/controllers/store/orders_controller.rb
	new file:   app/controllers/tairyo_controller.rb
	modified:   app/controllers/users_controller.rb
	modified:   app/controllers/vshop_controller.rb
	modified:   app/helpers/application_helper.rb
	new file:   app/helpers/coupon_helper.rb
	new file:   app/helpers/review_helper.rb
	new file:   app/helpers/tairyo_helper.rb

	modified:   app/models/ecstore/account.rb
	modified:   app/models/ecstore/order.rb
       new file:   app/models/ecstore/order_dining.rb
	modified:   app/models/ecstore/supplier.rb
	modified:   app/views/admin/goods/_form.html.erb
	modified:   app/views/comments/_comment.html.erb
	modified:   app/views/comments/_form.html.erb
	new file:   app/views/comments/tairyo_comment.html.erb
	new file:   app/views/coupon/index.html.erb
	new file:   app/views/coupon/lingqu.html.erb
	new file:   app/views/coupon/mycoupon.html.erb
	new file:   app/views/layouts/tairyo_new.html.erb
	modified:   app/views/mobile/show.html.erb
	new file:   app/views/sessions/create_tairyo.js.erb
	new file:   app/views/sessions/new_tairyo.html.erb
	new file:   app/views/sessions/register_tairyo.html.erb
	new file:   app/views/store/cart/jinbalang.html.erb
	modified:   app/views/store/cart/mobile.html.erb
	new file:   app/views/store/cart/tairyo.html.erb
	new file:   app/views/store/cart/tairyo_add.js.erb
	new file:   app/views/store/cart/tairyo_cart.html.erb
	new file:   app/views/store/cats/show_group.html.erb
	modified:   app/views/store/goods/_good.html.erb
	modified:   app/views/store/goods/_product.html.erb
	new file:   app/views/store/goods/tairyo_tuan.html.erb
	modified:   app/views/store/orders/_coupons.html.erb
	modified:   app/views/store/orders/new_mobile.html.erb
	new file:   app/views/store/orders/new_tairyo.html.erb
	new file:   app/views/store/orders/tairyo_order.html.erb
	new file:   app/views/store/orders/tairyo_share.html.erb
	modified:   app/views/store/shared/_btm_items.html.erb
	new file:   app/views/tairyo/bus.html.erb
	new file:   app/views/tairyo/car.html.erb
	new file:   app/views/tairyo/group.html.erb
	new file:   app/views/tairyo/index.html.erb
	new file:   app/views/tairyo/tairyo_tuan.html.erb
	new file:   app/views/tairyo/tese.html.erb
	new file:   app/views/tairyo/user.html.erb
	new file:   app/views/tairyo/walk.html.erb
	deleted:    config/database.yml.bak
	modified:   config/ecstore.yml.bak
	deleted:    config/ecstore.yml_bak
	modified:   config/routes.rb
	modified:   db/migrate/20130729083052_create_imodec_seo.rb
	modified:   db/migrate/20130731014845_add_path_and_params_to_imodec_seo.rb
	modified:   db/migrate/20130821030030_add_layout_to_static_pages.rb
	modified:   db/migrate/20130902094413_create_table_address.rb
	modified:   db/migrate/20130903025551_create_offline_coupons.rb
	modified:   db/migrate/20130909063735_create_table_coupon_downloads.rb
	modified:   db/migrate/20130910061813_add_detail_desc_to_brands.rb
	modified:   db/migrate/20130911084315_create_table_virtual_goods.rb
	modified:   db/migrate/20130916024000_add_slug_to_virtual_goods.rb
	modified:   db/migrate/20130918061922_create_table_payment_log.rb
	modified:   db/migrate/20131128061922_create_table_suppliers.rb
	deleted:    db/migrate/20140310170622_create_table_inventory.rb
	new file:   db/migrate/20140310170622_create_table_inventorys.rb
	new file:   db/migrate/20140813014927_create_order_dinings.rb
	modified:   db/schema.rb
	new file:   test/fixtures/order_dinings.yml
	new file:   test/fixtures/reviews.yml
	new file:   test/fixtures/sdb_b2c_order_dinings.yml
	new file:   test/functional/coupon_controller_test.rb
	new file:   test/functional/review_controller_test.rb
	new file:   test/functional/tairyo_controller_test.rb
	new file:   test/unit/helpers/coupon_helper_test.rb
	new file:   test/unit/helpers/review_helper_test.rb
	new file:   test/unit/helpers/tairyo_helper_test.rb
	new file:   test/unit/order_dining_test.rb
	new file:   test/unit/review_test.rb
	new file:   test/unit/sdb_b2c_order_dining_test.rb
	modified:   .idea/workspace.xml
Merge branch 'master' of https://github.com/jason0037/vt

Conflicts:
	.idea/workspace.xml
	app/controllers/store/orders_controller.rb

	modified:   .idea/workspace.xml
	new file:   app/assets/images/vshop/dayu.jpg
	modified:   app/controllers/admin/suppliers_controller.rb
	modified:   app/controllers/admin/wechat_controller.rb
	modified:   app/controllers/store/orders_controller.rb
	modified:   app/decorators/controllers/weixin_rails_middleware/weixin_controller_decorator.rb
	modified:   app/models/ecstore/order.rb
	modified:   app/models/ecstore/supplier.rb
	modified:   app/models/ecstore/wechat_follower.rb
	modified:   app/views/admin/wechat/followers.html.erb
	modified:   app/views/layouts/vshop.html.erb
	modified:   app/views/store/cats/show_mobile.html.erb
	modified:   app/views/store/orders/share.html.erb
	modified:   config/environment.rb
	modified:   config/initializers/weixin_rails_middleware.rb
	new file:   db/migrate/20140805071350_add_weixin_secret_key_and_weixin_token_to_public_accounts.rb
	new file:   readme
	deleted:    readme