嗨森逛服务

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.

袁野 d4153a41cf Merge branch 'order' into 2.0-dev ... * order: 提交代码 提交代码 提交代码 提交代码 提交diam 提交代码 提交代码 # Conflicts: # hai-cweb/src/main/java/com/cweb/controller/HighTestController.java # hai-service/src/main/java/com/hai/enum_type/CompanyAmountSourceTypeEnum.java # hai-service/src/main/java/com/hai/service/HighFleetOilCardUserService.java # hai-service/src/main/java/com/hai/service/impl/HighFleetOilCardServiceImpl.java # hai-service/src/main/java/com/hai/service/impl/HighFleetOilCardUserServiceImpl.java		2 years ago
..
classes	Merge branch 'order' into 2.0-dev	2 years ago
maven-archiver	Merge branch 'dev_yy' into 2.0-dev	2 years ago
maven-status/maven-compiler-plugin/compile/default-compile	Merge branch 'order' into 2.0-dev	2 years ago