# Conflicts:
#	.gitignore
#	README.md
#	pom.xml
#	src/main/java/com/geekq/miaosha/GeekQMainApplication.java
#	src/main/java/com/geekq/miaosha/access/AccessInterceptor.java
#	src/main/java/com/geekq/miaosha/access/AccessKey.java
#	src/main/java/com/geekq/miaosha/access/AccessLimit.java
#	src/main/java/com/geekq/miaosha/access/UserContext.java
#	src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java
#	src/main/java/com/geekq/miaosha/config/WebConfig.java
#	src/main/java/com/geekq/miaosha/controller/DemoController.java
#	src/main/java/com/geekq/miaosha/controller/MiaoshaController.java
#	src/main/java/com/geekq/miaosha/controller/OrderController.java
#	src/main/java/com/geekq/miaosha/dao/DruidConfig.java
#	src/main/java/com/geekq/miaosha/dao/GoodsDao.java
#	src/main/java/com/geekq/miaosha/dao/OrderDao.java
#	src/main/java/com/geekq/miaosha/dao/UserDao.java
#	src/main/java/com/geekq/miaosha/domain/Goods.java
#	src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java
#	src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java
#	src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java
#	src/main/java/com/geekq/miaosha/domain/OrderInfo.java
#	src/main/java/com/geekq/miaosha/domain/User.java
#	src/main/java/com/geekq/miaosha/mybatis/README.md
#	src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java
#	src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java
#	src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java
#	src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java
#	src/main/java/com/geekq/miaosha/redis/GoodsKey.java
#	src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java
#	src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java
#	src/main/java/com/geekq/miaosha/redis/RedisService.java
#	src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java
#	src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java
#	src/main/java/com/geekq/miaosha/redis/RedissonProperties.java
#	src/main/java/com/geekq/miaosha/redis/RedissonService.java
#	src/main/java/com/geekq/miaosha/result/CodeMsg.java
#	src/main/java/com/geekq/miaosha/service/GoodsService.java
#	src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java
#	src/main/java/com/geekq/miaosha/service/MiaoshaService.java
#	src/main/java/com/geekq/miaosha/service/OrderService.java
#	src/main/java/com/geekq/miaosha/service/UserService.java
#	src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java
#	src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java
#	src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java
#	src/main/java/com/geekq/miaosha/vo/GoodsVo.java
#	src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java
#	src/main/resources/application-dev.properties
#	src/main/resources/application-prod.properties
#	src/main/resources/application-test.properties
#	src/main/resources/application.properties
#	src/main/resources/config/application-test.properties
#	src/main/resources/dubbo/springmvc.xml
#	src/main/resources/static/goods_detail.htm
#	src/main/resources/static/js/common.js
#	src/main/resources/static/js/jquery.min.js
#	src/main/resources/static/order_detail.htm
#	src/main/resources/templates/goods_detail.html
#	src/main/resources/templates/goods_list.html
#	src/main/resources/templates/hello.html
#	src/main/resources/templates/login.html
#	src/main/resources/templates/miaosha_fail.html
#	src/main/resources/templates/order_detail.html