Merge branch 'dev_yy'

* dev_yy:
  1
  提交代码
  提交代码
  提交代码
  1
  1

# Conflicts:
#	hai-cweb/src/main/java/com/cweb/controller/HighUserCardController.java
#	hai-user/target/classes/com/web/config/AuthConfig.class
#	hai-user/target/classes/com/web/controller/DiscountController.class
#	hai-user/target/hai-user-1.0-SNAPSHOT.jar
#	hai-user/target/hai-user-1.0-SNAPSHOT.jar.original
#	hai-user/target/maven-archiver/pom.properties
#	hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
#	hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

.gitignore

@@ -40,3 +40,13 @@ v1/hai-schedule.iml
 
 
 hai-service/hai-service.iml
+hai-bweb/src/main/java/com/bweb/controller/ApiIpAddressController.java
+hai-service/src/main/java/com/hai/dao/ApiIpAddressMapper.java
+hai-service/src/main/java/com/hai/dao/ApiIpAddressMapperExt.java
+hai-service/src/main/java/com/hai/dao/ApiIpAddressSqlProvider.java
+hai-service/src/main/java/com/hai/entity/ApiIpAddress.java
+hai-service/src/main/java/com/hai/entity/ApiIpAddressExample.java
+hai-service/src/main/java/com/hai/service/ApiIpAddressService.java
+hai-service/src/main/java/com/hai/service/impl/ApiIpAddressServiceImpl.java
+v1/src/main/java/com/v1/controller/ApiMerchantsController.java
+v1/src/main/java/com/v1/controller/ApiOrderController.java