 袁野
|
3bf7fcf3ea
|
Merge branch 'master' into 2.0-dev
* master:
修改配置星巴克 肯德基 会员充值 话费 微信商户号
修改配置星巴克 肯德基 会员充值 话费 微信商户号
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
# hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
|
2 years ago |
|
袁野
|
149c503efb
|
Merge branch 'master' into 2.0-dev
* master:
修改配置星巴克 肯德基 会员充值 话费 微信商户号
修改配置星巴克 肯德基 会员充值 话费 微信商户号
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
# hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
|
2 years ago |
 胡锐
|
58b46af401
|
提交代码
|
2 years ago |
|
袁野
|
270be7cf13
|
Merge branch 'master' into 2.0-dev
* master:
修改配置星巴克 肯德基 会员充值 话费 微信商户号
修改配置星巴克 肯德基 会员充值 话费 微信商户号
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
# hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
|
2 years ago |
|
袁野
|
f171d7d434
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
|
胡锐
|
868098a4b9
|
提交代码
|
2 years ago |
|
袁野
|
f1080055ed
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
|
袁野
|
1b565faba0
|
Merge branch 'master' into 2.0-dev
* master:
修改配置星巴克 肯德基 会员充值 话费 微信商户号
修改配置星巴克 肯德基 会员充值 话费 微信商户号
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
# hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
|
2 years ago |
|
袁野
|
4f93b703d6
|
Merge branch 'master' into 2.0-dev
* master:
修改配置星巴克 肯德基 会员充值 话费 微信商户号
修改配置星巴克 肯德基 会员充值 话费 微信商户号
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
# hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
|
2 years ago |
|
胡锐
|
0fb74a2e3f
|
提交代码
|
2 years ago |
|
胡锐
|
2ff0fc63de
|
提交diam
|
2 years ago |
|
袁野
|
681dbf91b4
|
Merge branch 'master' into 2.0-dev
* master:
修改配置星巴克 肯德基 会员充值 话费 微信商户号
修改配置星巴克 肯德基 会员充值 话费 微信商户号
# Conflicts:
# hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
# hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
|
2 years ago |
|
袁野
|
24f6a46c8b
|
修改配置星巴克 肯德基 会员充值 话费 微信商户号
|
2 years ago |
|
胡锐
|
9233345d63
|
Merge branch '2.0-dev' of http://139.159.177.244:3000/hurui/hai-server into 2.0-dev
|
2 years ago |
|
胡锐
|
102f95a436
|
提交代码
|
2 years ago |
|
袁野
|
3b8be7c566
|
Merge branch '2.0-dev' of http://139.159.177.244:3000/hurui/hai-server into 2.0-dev
* '2.0-dev' of http://139.159.177.244:3000/hurui/hai-server:
提交代码
|
2 years ago |
|
袁野
|
6df0e3141a
|
修改配置星巴克 肯德基 会员充值 话费 微信商户号
|
2 years ago |
|
袁野
|
55247ab60d
|
修改配置星巴克 肯德基 会员充值 话费 微信商户号
|
2 years ago |
|
胡锐
|
a16f04a05c
|
提交代码
|
2 years ago |
|
胡锐
|
b7279e50fa
|
提交代码
|
2 years ago |
|
胡锐
|
49f43a0cf6
|
提交代码
|
2 years ago |
|
袁野
|
2da84f9784
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
|
袁野
|
51b9c975c6
|
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 |
|
胡锐
|
9c79e522d7
|
提交代码
|
2 years ago |
|
袁野
|
dcefad1b6c
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
|
2 years ago |
|
袁野
|
ef68627087
|
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 |
|
胡锐
|
57bb56df7f
|
提交代码
|
2 years ago |
|
胡锐
|
a9bcd6800f
|
提交代码
|
2 years ago |
|
胡锐
|
bc6713e33b
|
提交代码
|
2 years ago |
|
胡锐
|
e9ba049a32
|
提交代码
|
2 years ago |
|
胡锐
|
e52365c058
|
提交diam
|
2 years ago |
|
胡锐
|
8b99b14929
|
Merge branch '2.0-dev' of http://139.159.177.244:3000/hurui/hai-server into 2.0-dev
|
2 years ago |
|
胡锐
|
4211df4a3b
|
提交代码
|
2 years ago |
|
袁野
|
b2d9bfc0dd
|
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 |
|
胡锐
|
931cc698f4
|
Merge branch '2.0-dev' of http://139.159.177.244:3000/hurui/hai-server into 2.0-dev
|
2 years ago |
|
胡锐
|
1aaab689ba
|
提交代码
|
2 years ago |
|
袁野
|
56880e63e9
|
Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev
# Conflicts:
# hai-user/target/hai-user-1.0-SNAPSHOT.jar
# hai-user/target/hai-user-1.0-SNAPSHOT.jar.original
|
2 years ago |
|
袁野
|
c1ad172bae
|
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 |
|
胡锐
|
5a17aebcc9
|
提交代码
|
2 years ago |
|
胡锐
|
4af688d7b2
|
提交代码
|
2 years ago |
|
袁野
|
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 |
