嗨森逛服务

You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

袁野 bc4dfd0d04 Merge branch 'master' into 2.0-dev ... * master: Merge branch 'dev_yy' into 2.0-dev Merge branch 'dev_yy' into 2.0-dev 提交代码 提交代码 # Conflicts: # hai-bweb/src/main/java/com/bweb/controller/ApiMerchantsController.java # hai-bweb/src/main/java/com/bweb/controller/HighTestController.java # hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java # hai-service/src/main/java/com/hai/service/impl/ApiMerchantsServiceImpl.java # hai-service/src/main/java/com/hai/service/impl/ApiOpenServiceImpl.java # 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 # v1/src/main/java/com/v1/controller/ApiMerchantsController.java # v1/src/main/java/com/v1/controller/ApiOrderController.java # v1/src/main/java/com/v1/controller/HighOrderController.java # v1/src/main/java/com/v1/controller/ThirdPartyController.java		2 years ago
..
v1	Merge branch 'master' into 2.0-dev	2 years ago
V1Application.java	1	2 years ago