 袁野
|
e5c17730ca
|
Merge branch 'dev_yy' into 2.0-dev
* dev_yy: (25 commits)
提交代理商
1
1
提交实物
提交代码
提交代码
提交代码
提交抽奖代码
1
提交代码
提交代码
提交代码
提交代码
提交代码
提交
1
1
修改首页没有积分专区
提交代码
修改小程序注册用券
...
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
# hai-service/src/main/java/com/hai/common/utils/DateUtil.java
# hai-service/src/main/java/com/hai/common/utils/RequestUtils.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
# hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
# hai-service/src/main/java/com/hai/entity/HighChildOrder.java
# hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
# hai-service/src/main/java/com/hai/entity/HighOrder.java
# hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java
# hai-service/src/main/java/com/hai/service/HighUserService.java
# hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java
# hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
|
2 years ago |
|
袁野
|
68c1108434
|
2
|
2 years ago |
|
袁野
|
6bca0b0faa
|
Merge branch 'dev_yy' into 2.0-dev
* dev_yy: (25 commits)
提交代理商
1
1
提交实物
提交代码
提交代码
提交代码
提交抽奖代码
1
提交代码
提交代码
提交代码
提交代码
提交代码
提交
1
1
修改首页没有积分专区
提交代码
修改小程序注册用券
...
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
# hai-service/src/main/java/com/hai/common/utils/DateUtil.java
# hai-service/src/main/java/com/hai/common/utils/RequestUtils.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
# hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
# hai-service/src/main/java/com/hai/entity/HighChildOrder.java
# hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
# hai-service/src/main/java/com/hai/entity/HighOrder.java
# hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java
# hai-service/src/main/java/com/hai/service/HighUserService.java
# hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java
# hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
|
2 years ago |
|
袁野
|
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 |
|
袁野
|
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 |
|
袁野
|
de67f3c40c
|
Merge branch 'dev_yy' into 2.0-dev
* dev_yy: (25 commits)
提交代理商
1
1
提交实物
提交代码
提交代码
提交代码
提交抽奖代码
1
提交代码
提交代码
提交代码
提交代码
提交代码
提交
1
1
修改首页没有积分专区
提交代码
修改小程序注册用券
...
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
# hai-service/src/main/java/com/hai/common/utils/DateUtil.java
# hai-service/src/main/java/com/hai/common/utils/RequestUtils.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
# hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
# hai-service/src/main/java/com/hai/entity/HighChildOrder.java
# hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
# hai-service/src/main/java/com/hai/entity/HighOrder.java
# hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java
# hai-service/src/main/java/com/hai/service/HighUserService.java
# hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java
# hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
|
2 years ago |
|
袁野
|
90b5240651
|
Merge branch 'dev_yy' into 2.0-dev
* dev_yy: (25 commits)
提交代理商
1
1
提交实物
提交代码
提交代码
提交代码
提交抽奖代码
1
提交代码
提交代码
提交代码
提交代码
提交代码
提交
1
1
修改首页没有积分专区
提交代码
修改小程序注册用券
...
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
# hai-service/src/main/java/com/hai/common/utils/DateUtil.java
# hai-service/src/main/java/com/hai/common/utils/RequestUtils.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
# hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
# hai-service/src/main/java/com/hai/entity/HighChildOrder.java
# hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
# hai-service/src/main/java/com/hai/entity/HighOrder.java
# hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java
# hai-service/src/main/java/com/hai/service/HighUserService.java
# hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java
# hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
|
2 years ago |
 胡锐
|
01cde70b77
|
提交代码
|
2 years ago |
|
胡锐
|
a0d2ad940d
|
提交代码
|
2 years ago |
|
胡锐
|
3ddcaff3ca
|
提交代码
|
2 years ago |
|
胡锐
|
0d5392af05
|
Merge branch 'order' of http://139.159.177.244:3000/hurui/hai-server into order
|
2 years ago |
|
袁野
|
10e65cc49c
|
Merge branch 'dev_yy' into 2.0-dev
* dev_yy: (25 commits)
提交代理商
1
1
提交实物
提交代码
提交代码
提交代码
提交抽奖代码
1
提交代码
提交代码
提交代码
提交代码
提交代码
提交
1
1
修改首页没有积分专区
提交代码
修改小程序注册用券
...
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
# hai-service/src/main/java/com/hai/common/utils/DateUtil.java
# hai-service/src/main/java/com/hai/common/utils/RequestUtils.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
# hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
# hai-service/src/main/java/com/hai/entity/HighChildOrder.java
# hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
# hai-service/src/main/java/com/hai/entity/HighOrder.java
# hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java
# hai-service/src/main/java/com/hai/service/HighUserService.java
# hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java
# hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
|
2 years ago |
|
袁野
|
13ab10e10a
|
1
|
2 years ago |
|
袁野
|
7f09e4bbf1
|
Merge branch 'dev_yy' into 2.0-dev
* dev_yy: (25 commits)
提交代理商
1
1
提交实物
提交代码
提交代码
提交代码
提交抽奖代码
1
提交代码
提交代码
提交代码
提交代码
提交代码
提交
1
1
修改首页没有积分专区
提交代码
修改小程序注册用券
...
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
# hai-service/src/main/java/com/hai/common/utils/DateUtil.java
# hai-service/src/main/java/com/hai/common/utils/RequestUtils.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
# hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
# hai-service/src/main/java/com/hai/entity/HighChildOrder.java
# hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
# hai-service/src/main/java/com/hai/entity/HighOrder.java
# hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java
# hai-service/src/main/java/com/hai/service/HighUserService.java
# hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java
# hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
|
2 years ago |
|
袁野
|
a42aef1fb0
|
Merge branch 'dev_yy' into 2.0-dev
* dev_yy: (25 commits)
提交代理商
1
1
提交实物
提交代码
提交代码
提交代码
提交抽奖代码
1
提交代码
提交代码
提交代码
提交代码
提交代码
提交
1
1
修改首页没有积分专区
提交代码
修改小程序注册用券
...
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
# hai-service/src/main/java/com/hai/common/utils/DateUtil.java
# hai-service/src/main/java/com/hai/common/utils/RequestUtils.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
# hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
# hai-service/src/main/java/com/hai/entity/HighChildOrder.java
# hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
# hai-service/src/main/java/com/hai/entity/HighOrder.java
# hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java
# hai-service/src/main/java/com/hai/service/HighUserService.java
# hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java
# hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
|
2 years ago |
|
袁野
|
688ab67a45
|
Merge branch 'dev_yy' into 2.0-dev
* dev_yy: (25 commits)
提交代理商
1
1
提交实物
提交代码
提交代码
提交代码
提交抽奖代码
1
提交代码
提交代码
提交代码
提交代码
提交代码
提交
1
1
修改首页没有积分专区
提交代码
修改小程序注册用券
...
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
# hai-service/src/main/java/com/hai/common/utils/DateUtil.java
# hai-service/src/main/java/com/hai/common/utils/RequestUtils.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
# hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
# hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
# hai-service/src/main/java/com/hai/entity/HighChildOrder.java
# hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
# hai-service/src/main/java/com/hai/entity/HighOrder.java
# hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java
# hai-service/src/main/java/com/hai/service/HighUserService.java
# hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java
# hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
|
2 years ago |
|
袁野
|
884daa1f39
|
提交代理商
|
2 years ago |
|
胡锐
|
2f73f9989f
|
提交代码
|
2 years ago |
|
胡锐
|
955c4e31e8
|
Merge branch 'master' of http://139.159.177.244:3000/hurui/hai-server
|
2 years ago |
|
袁野
|
970390e0e9
|
1
|
2 years ago |
|
袁野
|
d419756dac
|
Merge branch 'activit' into dev_yy
* activit:
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
|
2 years ago |
|
袁野
|
39af7f1c67
|
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
|
2 years ago |
|
袁野
|
e5a0f9d777
|
1
|
2 years ago |
|
袁野
|
45d1402bf3
|
Merge branch 'fleet_card' of http://139.159.177.244:3000/hurui/hai-server into activit
|
2 years ago |
|
袁野
|
d908289faf
|
提交实物
|
2 years ago |
|
胡锐
|
1cc0c7484e
|
提交代码
|
2 years ago |
|
胡锐
|
01ba1de3d4
|
提交代码
|
2 years ago |
|
胡锐
|
d12bef55c3
|
提交代码
|
2 years ago |
|
袁野
|
fe0ac2dcf2
|
提交抽奖代码
|
2 years ago |
|
袁野
|
66e2db5ec8
|
1
|
2 years ago |
|
袁野
|
174c8fdb7e
|
提交代码
|
2 years ago |
|
胡锐
|
abb4fc1f57
|
提交代码
|
2 years ago |
|
胡锐
|
6120d54e1d
|
提交代码
|
2 years ago |
|
袁野
|
70d5334e2a
|
提交代码
|
2 years ago |
|
袁野
|
3ed726289c
|
提交代码
|
2 years ago |
|
胡锐
|
d063b9fe05
|
提交代码
|
2 years ago |
|
胡锐
|
8bb1e466c9
|
提交
|
2 years ago |
|
胡锐
|
389d7f4140
|
提交代码
|
2 years ago |
|
袁野
|
a04ed18fb7
|
Merge remote-tracking branch 'origin/dev_yy' into dev_yy
|
2 years ago |
|
袁野
|
0128969970
|
1
|
2 years ago |
|
袁野
|
cf6f1d4c6a
|
1
|
2 years ago |
|
袁野
|
36dd772b1c
|
修改首页没有积分专区
|
2 years ago |
|
胡锐
|
940ac2fa6c
|
提交diam
|
2 years ago |
|
胡锐
|
cbfd795f5f
|
提交代码
|
2 years ago |
|
袁野
|
40291a770d
|
修改首页没有积分专区
|
2 years ago |
|
胡锐
|
91d3f254aa
|
提交代码
|
2 years ago |
|
袁野
|
dc5daa769e
|
修改首页没有积分专区
|
2 years ago |
|
袁野
|
0e514bfc8f
|
修改首页没有积分专区
|
2 years ago |
|
胡锐
|
3c5b3f545f
|
提交代码
|
2 years ago |
|
胡锐
|
8483d44a72
|
提交代码
|
2 years ago |
